foodwave can now be full

code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave.java

@@ -126,6 +126,14 @@ public class FoodWave extends GenericEntity {
     }
     }
 
 
     public boolean isFull() {
     public boolean isFull() {
+        if(getMaximumFoods() <= 0) {
+            return false;
+        }
+        
+        if(getReservedCount() >= getMaximumFoods()) {
+            return true;
+        } 
+        
         return false;
         return false;
     }
     }
 
 
@@ -174,6 +182,12 @@ public class FoodWave extends GenericEntity {
     }
     }
 
 
     public Integer getMaximumFoods() {
     public Integer getMaximumFoods() {
+        
+        
+        if(maximumFoods == null) {
+            return 0;
+        }
+        
         return maximumFoods;
         return maximumFoods;
     }
     }
 
 

code/LanBortalWeb/WebContent/foodmanager/listFoodwaves.xhtml

@@ -14,7 +14,6 @@
 		<ui:define name="content">
 		<ui:define name="content">
 			<h:form>
 			<h:form>
 				<p:dataTable styleClass="bordertable" value="#{foodWaveView.foodWaves}" sortBy="#{foodwave.time}" sortOrder="ascending" var="foodwave" editable="true" rowStyleClass="#{not foodwave.isOrderable() ? foodwave.isDelivered() ? 'hidden' : 'closed' : null}">
 				<p:dataTable styleClass="bordertable" value="#{foodWaveView.foodWaves}" sortBy="#{foodwave.time}" sortOrder="ascending" var="foodwave" editable="true" rowStyleClass="#{not foodwave.isOrderable() ? foodwave.isDelivered() ? 'hidden' : 'closed' : null}">
-					<!--  rowStyleClass="#{foodWave.closed ? 'old' : null}  -->
 					<p:ajax event="rowEdit" listener="#{foodWaveView.onEditFoodWave}" />
 					<p:ajax event="rowEdit" listener="#{foodWaveView.onEditFoodWave}" />
 					<f:facet name="header">
 					<f:facet name="header">
 						<h:outputLabel value="#{i18n['foodWave.activeFoodWaves']}" />
 						<h:outputLabel value="#{i18n['foodWave.activeFoodWaves']}" />

code/LanBortalWeb/WebContent/resources/cditools/foodwave/list.xhtml

@@ -15,16 +15,18 @@
 	<!-- 	<h:outputScript target="head" library="script" name="shopscript.js" /> -->
 	<!-- 	<h:outputScript target="head" library="script" name="shopscript.js" /> -->
 	<h:outputScript library="primefaces" name="jquery/jquery.js" />
 	<h:outputScript library="primefaces" name="jquery/jquery.js" />
 
 
-	<p:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign" styleClass="bordertable" value="#{foodWaveView.foodWaves}" var="foodwave" sortBy="#{foodwave.time.time}">
+	<p:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign" styleClass="bordertable" value="#{foodWaveView.foodWaves}" var="foodwave" sortBy="#{foodwave.time.time}" rowStyleClass="#{foodwave.isFull() ? 'closed' : null}">
 		<p:column sortBy="#{i18n['foodWave.name']}">
 		<p:column sortBy="#{i18n['foodWave.name']}">
 			<f:facet name="header">
 			<f:facet name="header">
 				<h:outputLabel id="name" value="#{i18n['foodWave.name']}" />
 				<h:outputLabel id="name" value="#{i18n['foodWave.name']}" />
 			</f:facet>
 			</f:facet>
 
 
-			<h:link outcome="#{cc.attrs.outcome}" value="#{foodwave.name}">
+			<h:link rendered="#{not foodwave.isFull()}" outcome="#{cc.attrs.outcome}" value="#{foodwave.name}">
 				<f:param name="foodwaveid" value="#{foodwave.id}" />
 				<f:param name="foodwaveid" value="#{foodwave.id}" />
 				<f:param name="userid" value="#{userView.user.user.id}" />
 				<f:param name="userid" value="#{userView.user.user.id}" />
  			</h:link>
  			</h:link>
+ 			
+ 			<h:outputText  rendered="#{foodwave.isFull()}"  value="#{foodwave.name}" />
 		</p:column>
 		</p:column>
 		<p:column sortBy="#{foodwave.template.name}">
 		<p:column sortBy="#{foodwave.template.name}">
 			<f:facet name="header">
 			<f:facet name="header">