mtsinc7
/
gourmetj-springboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup on shopping category

Browse Source
version2
Tim Holloway 2 years ago
parent a01cf6ffa7
commit e4da9a6a71
2 changed files with 80 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java
  2. 150
      src/main/resources/META-INF/resources/detailEdit.xhtml

14
src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java
Unescape View File

@ -597,7 +597,7 @@ public class RecipeDetailBean implements Serializable {
for (IngredientUI iui : saveIng) {
Ingredient ing = iui.getIngredient();
ing.setRecipe(recipe);
if ( ! updateShopcat(ing) ) {
if ( ! updateShopcat(iui) ) {
return false;
}
iList.add(ing);
@ -630,7 +630,8 @@ public class RecipeDetailBean implements Serializable {
* @param ing Ingredient to update
* @return true if update succeeded.
*/
private boolean updateShopcat(Ingredient ing) {
private boolean updateShopcat(IngredientUI ingUI) {
final Ingredient ing = ingUI.getIngredient();
final String ingKey = ing.getIngkey();
if ( (ingKey == null) || (ingKey.isBlank())) {
ing.setIngkey(null);
@ -805,12 +806,11 @@ public class RecipeDetailBean implements Serializable {
return shopcatList;
}
public void ajaxUpdateShopcat(AjaxBehaviorEvent event) {
log.warn("SHOPCAT ");
// Shopcat scat = recipeService.findShopcatForIngredientKey(ssss);
// ing.setShopcat(scat);
public void ajaxUpdateShopcat(IngredientUI item) {
log.warn("SHOPCAT2 ");
updateShopcat(item);;
}
// ***
public String editDescription() {

150
src/main/resources/META-INF/resources/detailEdit.xhtml
Unescape View File

@ -177,100 +177,96 @@
/>
</p:commandButton>
</h:panelGroup>
<h:panelGrid columns="1"
id="ingredientsDiv"
style="height: 420px;"
columnClasses="alignTop"
<p:dataTable id="ingredientTable"
style="width: 100%; height: 420px; margin-top: 8px"
value="#{recipeDetailBean.ingredients}"
scrollable="true"
scrollHeight="380" var="item"
>
<p:dataTable id="ingredientTable"
style="width: 100%"
value="#{recipeDetailBean.ingredients}"
var="item"
<p:column label="Sel."
align="center"
style="width: 2em"
>
<p:column label="Sel."
align="center"
style="width: 2em"
<p:selectBooleanCheckbox
id="selected"
value="#{item.selected}"
>
<p:selectBooleanCheckbox
id="selected"
value="#{item.selected}"
>
<f:ajax
immediate="true"
render="pnlIngredients"
/>
</p:selectBooleanCheckbox>
</p:column>
<p:column
style="width: 4.4em"
>
<f:facet name="header">
<f:ajax immediate="true"
render="pnlIngredients"
/>
</p:selectBooleanCheckbox>
</p:column>
<p:column style="width: 3.6em">
<f:facet name="header">
Amt.
</f:facet>
<p:inputText id="ingAmt"
size="5"
value="#{item.displayAmount}"
style="text-align: right"
rendered="#{not item.ingGroup}"
>
</p:inputText>
</p:column>
<p:column style="width: 7em">
<f:facet name="header">
<p:inputText id="ingAmt"
size="3"
value="#{item.displayAmount}"
style="text-align: right"
rendered="#{not item.ingGroup}"
>
</p:inputText>
</p:column>
<p:column style="width: 7em">
<f:facet name="header">
Units
</f:facet>
<p:inputText id="ingUnit"
value="#{item.unit}"
size="10"
rendered="#{not item.ingGroup}"
>
</p:inputText>
</p:column>
<p:column style="width: 26em">
<f:facet name="header">
<p:inputText id="ingUnit"
value="#{item.unit}"
size="10"
rendered="#{not item.ingGroup}"
>
</p:inputText>
</p:column>
<p:column style="width: 26em">
<f:facet name="header">
Item
</f:facet>
<p:inputText id="ingItem"
size="42"
value="#{item.item}"
>
</p:inputText>
</p:column>
<p:column label="Optional"
align="center"
styleClass="ingSel"
<p:inputText id="ingItem"
size="42"
value="#{item.item}"
>
<f:facet name="header">
</p:inputText>
</p:column>
<p:column label="Optional"
align="center"
styleClass="ingSel"
>
<f:facet name="header">
Opt.
</f:facet>
<p:selectBooleanCheckbox
id="ingOpt"
value="#{item.optionalCB}"
rendered="#{not item.ingGroup}"
/>
</p:column>
<p:column style="width: 13em">
<f:facet name="header">
<p:selectBooleanCheckbox
id="ingOpt"
value="#{item.optionalCB}"
rendered="#{not item.ingGroup}"
/>
</p:column>
<p:column style="width: 13em">
<f:facet name="header">
Ing. Key
</f:facet>
<p:inputText id="ingKey"
value="#{item.ingkey}"
size="20"
rendered="#{not item.ingGroup}"
<p:inputText id="ingKey"
value="#{item.ingkey}"
size="20"
rendered="#{not item.ingGroup}"
>
<f:ajax event="change"
listener="#{recipeDetailBean.ajaxUpdateShopcat(item)}"
render="shopCat"
/>
</p:column>
<p:column>
<f:facet name="header">
</p:inputText>
</p:column>
<p:column>
<f:facet name="header">
Shop. Cat.
</f:facet>
<h:outputText
id="shopCat"
value="#{item.shopCat}"
rendered="#{not item.ingGroup}"
/>
</p:column>
</p:dataTable>
</h:panelGrid>
<h:outputText id="shopCat"
value="#{item.shopCat}"
rendered="#{not item.ingGroup}"
/>
</p:column>
</p:dataTable>
<h:panelGroup id="pnlIng">
<p:remoteCommand name="ingButton"
action="#{recipeDetailBean.doAddIngredient}"

Write Preview
Loading…
Cancel
Save