Modified to look for recipes.db in user's home directory

version2
Tim Holloway 2 years ago
parent 7acedbb6dd
commit dddd36dfd5
  1. 2
      application.properties
  2. 2
      src/main/resources/META-INF/resources/application.yml
  3. 32
      src/main/resources/META-INF/resources/detailEdit.xhtml

@ -5,7 +5,7 @@ joinfaces.primefaces.theme=bluesky
spring.thymeleaf.enabled=false spring.thymeleaf.enabled=false
server.error.whitelabel.enabled=false server.error.whitelabel.enabled=false
spring.datasource.url=jdbc:sqlite:/home/timh/foo/bazz/recipes.db spring.datasource.url=jdbc:sqlite:${home}/recipes.db
#spring.datasource.username=dbuser #spring.datasource.username=dbuser
#pring.datasource.password=dbpass #pring.datasource.password=dbpass
spring.datasource.driverClassName=org.sqlite.JDBC spring.datasource.driverClassName=org.sqlite.JDBC

@ -1,6 +1,6 @@
spring: spring:
datasource: datasource:
url: jdbc:sqlite:/home/timh/foo/bazz/recipes.db url: jdbc:sqlite:${home}/recipes.db
jpa: jpa:
hibernate: hibernate:
ddl-auto: none ddl-auto: none

@ -259,12 +259,13 @@
</p:column> </p:column>
<p:column style="width: 13em"> <p:column style="width: 13em">
<f:facet name="header"> <f:facet name="header">
Ing. Key Ingredient Key
</f:facet> </f:facet>
<p:inputText id="ingKey" <p:inputText id="ingKey"
value="#{item.ingkey}" value="#{item.ingkey}"
size="20" size="20"
rendered="#{not item.ingGroup}" rendered="#{not item.ingGroup}"
title="Ingredient key selects Shopping Category"
> >
<f:ajax <f:ajax
event="change" event="change"
@ -273,23 +274,30 @@
/> />
</p:inputText> </p:inputText>
</p:column> </p:column>
<p:column> <p:column
style="width: 2em"
>
<f:facet name="header"> <f:facet name="header">
Shop. Cat. E
</f:facet> </f:facet>
<h:outputText
id="shopCat"
value="#{item.shopCat}"
rendered="#{not item.ingGroup}"
/>
<p:commandButton <p:commandButton
id="eShopcat" id="eShopcat"
value="E" value="E"
action="#{recipeDetailBean.ajaxEditShopcat(item)}" action="#{recipeDetailBean.ajaxEditShopcat(item)}"
update="editShopcatDlg" update="editShopcatDlg"
oncomplete="PF('editShopcatDlg').show()" oncomplete="PF('editShopcatDlg').show()"
> title="Edit the shopping category for ing. key"
</p:commandButton> />
</p:column>
<p:column>
<f:facet name="header">
Shopping Cat.
</f:facet>
<h:outputText
id="shopCat"
value="#{item.shopCat}"
rendered="#{not item.ingGroup}"
/>
</p:column> </p:column>
</p:dataTable> </p:dataTable>
<h:panelGroup id="pnlIng"> <h:panelGroup id="pnlIng">
@ -351,7 +359,9 @@
/> />
</h:form> </h:form>
</p:panel> </p:panel>
<p:dialog id="editShopcatDlg" widgetVar="editShopcatDlg"> <p:dialog id="editShopcatDlg"
widgetVar="editShopcatDlg"
>
<ui:include src="editShopcat.xhtml" /> <ui:include src="editShopcat.xhtml" />
</p:dialog> </p:dialog>
</ui:define> </ui:define>

Loading…
Cancel
Save