From dddd36dfd52cf3eb253ee4c0851b14cc6a952fef Mon Sep 17 00:00:00 2001
From: Tim Holloway <timh@mousetech.com>
Date: Wed, 5 Jan 2022 14:13:13 -0500
Subject: [PATCH] Modified to look for recipes.db in user's home directory

---
 application.properties                        |  2 +-
 .../META-INF/resources/application.yml        |  2 +-
 .../META-INF/resources/detailEdit.xhtml       | 32 ++++++++++++-------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/application.properties b/application.properties
index 10eb6fb..3a41120 100644
--- a/application.properties
+++ b/application.properties
@@ -5,7 +5,7 @@ joinfaces.primefaces.theme=bluesky
 spring.thymeleaf.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
 #pring.datasource.password=dbpass
 spring.datasource.driverClassName=org.sqlite.JDBC
diff --git a/src/main/resources/META-INF/resources/application.yml b/src/main/resources/META-INF/resources/application.yml
index 3e5e2ea..f2e2a48 100644
--- a/src/main/resources/META-INF/resources/application.yml
+++ b/src/main/resources/META-INF/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url:  jdbc:sqlite:/home/timh/foo/bazz/recipes.db
+    url:  jdbc:sqlite:${home}/recipes.db
   jpa:
     hibernate:
       ddl-auto: none
diff --git a/src/main/resources/META-INF/resources/detailEdit.xhtml b/src/main/resources/META-INF/resources/detailEdit.xhtml
index 71852b4..7c26e01 100644
--- a/src/main/resources/META-INF/resources/detailEdit.xhtml
+++ b/src/main/resources/META-INF/resources/detailEdit.xhtml
@@ -259,12 +259,13 @@
                                     </p:column>
                                     <p:column style="width: 13em">
                                         <f:facet name="header">
-                                    Ing. Key
+                                    Ingredient Key
                                     </f:facet>
                                         <p:inputText id="ingKey"
                                             value="#{item.ingkey}"
                                             size="20"
                                             rendered="#{not item.ingGroup}"
+                                            title="Ingredient key selects Shopping Category"
                                         >
                                             <f:ajax
                                                 event="change"
@@ -273,23 +274,30 @@
                                             />
                                         </p:inputText>
                                     </p:column>
-                                    <p:column>
+                                    <p:column
+                                        style="width: 2em"
+                                    >
                                         <f:facet name="header">
-                                    Shop. Cat.
+                                    E
                                     </f:facet>
-                                        <h:outputText
-                                            id="shopCat"
-                                            value="#{item.shopCat}"
-                                            rendered="#{not item.ingGroup}"
-                                        />
                                         <p:commandButton
                                             id="eShopcat"
                                             value="E"
                                             action="#{recipeDetailBean.ajaxEditShopcat(item)}"
                                             update="editShopcatDlg"
                                             oncomplete="PF('editShopcatDlg').show()"
-                                        >
-                                        </p:commandButton>
+                                            title="Edit the shopping category for ing. key"
+                                        />
+                                    </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:dataTable>
                                 <h:panelGroup id="pnlIng">
@@ -351,7 +359,9 @@
                     />
                 </h:form>
             </p:panel>
-            <p:dialog id="editShopcatDlg" widgetVar="editShopcatDlg">
+            <p:dialog id="editShopcatDlg"
+                widgetVar="editShopcatDlg"
+            >
                 <ui:include src="editShopcat.xhtml" />
             </p:dialog>
         </ui:define>