Mercurial > bmsapp / changeset

--- a/src/EditRecipeTab3.cpp	Fri Jul 29 16:21:20 2022 +0200
+++ b/src/EditRecipeTab3.cpp	Fri Jul 29 16:45:11 2022 +0200
@@ -277,6 +277,8 @@
     newh.cohumulone = 0;
     newh.myrcene = 0;
     newh.total_oil = 0;
+    newh.utilisation = 20;
+    newh.bu_factor = 1;
 
     recipe->hops.append(newh);
     emit refreshAll();
@@ -396,7 +398,7 @@
     /*
      * Search the hop pointed by the index and instock flag.
      */
-    QString sql = "SELECT name,origin,alpha,beta,humulene,caryophyllene,cohumulone,myrcene,hsi,total_oil,type,form,cost FROM inventory_hops ";
+    QString sql = "SELECT * FROM inventory_hops ";
     if (instock)
         sql.append("WHERE inventory > 0 ");
     sql.append("ORDER BY origin,name");
@@ -410,19 +412,21 @@
     /*
      * Replace the hop record contents
      */
-    recipe->hops[recipe->hops_row].name = query.value(0).toString();
-    recipe->hops[recipe->hops_row].origin = query.value(1).toString();
-    recipe->hops[recipe->hops_row].alpha = query.value(2).toDouble();
-    recipe->hops[recipe->hops_row].beta = query.value(3).toDouble();
-    recipe->hops[recipe->hops_row].humulene = query.value(4).toDouble();
-    recipe->hops[recipe->hops_row].caryophyllene = query.value(5).toDouble();
-    recipe->hops[recipe->hops_row].cohumulone = query.value(6).toDouble();
-    recipe->hops[recipe->hops_row].myrcene = query.value(7).toDouble();
-    recipe->hops[recipe->hops_row].hsi = query.value(8).toDouble();
-    recipe->hops[recipe->hops_row].total_oil = query.value(9).toDouble();
-    recipe->hops[recipe->hops_row].type = query.value(10).toInt();
-    recipe->hops[recipe->hops_row].form = query.value(11).toInt();
-    recipe->hops[recipe->hops_row].cost = query.value(12).toDouble();
+    recipe->hops[recipe->hops_row].name = query.value("name").toString();
+    recipe->hops[recipe->hops_row].origin = query.value("origin").toString();
+    recipe->hops[recipe->hops_row].alpha = query.value("alpha").toDouble();
+    recipe->hops[recipe->hops_row].beta = query.value("beta").toDouble();
+    recipe->hops[recipe->hops_row].humulene = query.value("humulene").toDouble();
+    recipe->hops[recipe->hops_row].caryophyllene = query.value("caryophyllene").toDouble();
+    recipe->hops[recipe->hops_row].cohumulone = query.value("cohumulone").toDouble();
+    recipe->hops[recipe->hops_row].myrcene = query.value("myrcene").toDouble();
+    recipe->hops[recipe->hops_row].hsi = query.value("hsi").toDouble();
+    recipe->hops[recipe->hops_row].total_oil = query.value("total_oil").toDouble();
+    recipe->hops[recipe->hops_row].type = query.value("type").toInt();
+    recipe->hops[recipe->hops_row].form = query.value("form").toInt();
+    recipe->hops[recipe->hops_row].cost = query.value("cost").toDouble();
+    recipe->hops[recipe->hops_row].utilisation = query.value("utilisation").toDouble();
+    recipe->hops[recipe->hops_row].bu_factor = query.value("bu_factor").toDouble();
 
     /*
      * Update the visible fields