|
|
|
@ -144,9 +144,8 @@ |
|
|
|
style="width: 25%; vertical-align: top;" |
|
|
|
style="width: 25%; vertical-align: top;" |
|
|
|
> |
|
|
|
> |
|
|
|
<p:dataTable id="ingredients" |
|
|
|
<p:dataTable id="ingredients" |
|
|
|
showDirectLinksArrows="true" |
|
|
|
|
|
|
|
value="#{recipeDetailBean.ingredients}" |
|
|
|
value="#{recipeDetailBean.ingredients}" |
|
|
|
var="ingredient" |
|
|
|
var="item" |
|
|
|
rowStyleClass="#{item.ingGroup ? 'displayIngGroupRow' : null}" |
|
|
|
rowStyleClass="#{item.ingGroup ? 'displayIngGroupRow' : null}" |
|
|
|
> |
|
|
|
> |
|
|
|
<f:facet name="header"> |
|
|
|
<f:facet name="header"> |
|
|
|
@ -166,21 +165,21 @@ |
|
|
|
style="width: 3em; text-align: right" |
|
|
|
style="width: 3em; text-align: right" |
|
|
|
> |
|
|
|
> |
|
|
|
<h:outputText |
|
|
|
<h:outputText |
|
|
|
value="#{ingredient.displayAmount}" |
|
|
|
value="#{item.displayAmount}" |
|
|
|
/> |
|
|
|
/> |
|
|
|
</p:column> |
|
|
|
</p:column> |
|
|
|
<p:column label="Units" |
|
|
|
<p:column label="Units" |
|
|
|
style="width: 5em" |
|
|
|
style="width: 5em" |
|
|
|
> |
|
|
|
> |
|
|
|
<h:outputText |
|
|
|
<h:outputText |
|
|
|
value="#{ingredient.unit}" |
|
|
|
value="#{item.unit}" |
|
|
|
/> |
|
|
|
/> |
|
|
|
</p:column> |
|
|
|
</p:column> |
|
|
|
<p:column label="Item" |
|
|
|
<p:column label="Item" |
|
|
|
style="width: 20em" |
|
|
|
style="width: 20em" |
|
|
|
> |
|
|
|
> |
|
|
|
<h:outputText |
|
|
|
<h:outputText |
|
|
|
value="#{ingredient.item}" |
|
|
|
value="#{item.item}" |
|
|
|
/> |
|
|
|
/> |
|
|
|
</p:column> |
|
|
|
</p:column> |
|
|
|
<p:column label="Optional" |
|
|
|
<p:column label="Optional" |
|
|
|
@ -188,7 +187,7 @@ |
|
|
|
> |
|
|
|
> |
|
|
|
<p:selectBooleanCheckbox |
|
|
|
<p:selectBooleanCheckbox |
|
|
|
readonly="true" |
|
|
|
readonly="true" |
|
|
|
value="#{ingredient.optionalCB}" |
|
|
|
value="#{item.optionalCB}" |
|
|
|
/> |
|
|
|
/> |
|
|
|
</p:column> |
|
|
|
</p:column> |
|
|
|
</p:dataTable> |
|
|
|
</p:dataTable> |
|
|
|
|
