Mercurial > bmsapp / file diff

--- a/src/EditProductTab11.cpp	Fri Oct 28 16:37:49 2022 +0200
+++ b/src/EditProductTab11.cpp	Sat Oct 29 15:43:28 2022 +0200
@@ -416,25 +416,27 @@
         query.next();
     }
 
-    newf.name = query.value(0).toString();
-    newf.origin = query.value(1).toString();
-    newf.supplier = query.value(2).toString();
-    newf.cost = query.value(3).toDouble();
-    newf.type = query.value(4).toInt();
-    newf.yield = query.value(5).toDouble();
-    newf.color = query.value(6).toDouble();
-    newf.coarse_fine_diff = query.value(7).toDouble();
-    newf.moisture = query.value(8).toDouble();
-    newf.diastatic_power = query.value(9).toDouble();
-    newf.protein = query.value(10).toDouble();
-    newf.dissolved_protein = query.value(11).toDouble();
-    newf.max_in_batch = query.value(12).toDouble();
-    newf.graintype = query.value(13).toInt();
-    newf.recommend_mash = query.value(14).toInt() ? true:false;
+    newf.name = query.value("name").toString();
+    newf.origin = query.value("origin").toString();
+    newf.supplier = query.value("supplier").toString();
+    newf.cost = query.value("cost").toDouble();
+    newf.type = query.value("type").toInt();
+    newf.yield = query.value("yield").toDouble();
+    newf.color = query.value("color").toDouble();
+    newf.coarse_fine_diff = query.value("coarse_fine_diff").toDouble();
+    newf.moisture = query.value("moisture").toDouble();
+    newf.diastatic_power = query.value("diastatic_power").toDouble();
+    newf.protein = query.value("protein").toDouble();
+    newf.dissolved_protein = query.value("dissolved_protein").toDouble();
+    newf.max_in_batch = query.value("max_in_batch").toDouble();
+    newf.graintype = query.value("graintype").toInt();
+    newf.recommend_mash = query.value("recommend_mash").toInt() ? true:false;
     newf.add_after_boil = true;
-    newf.di_ph = query.value(16).toDouble();
-    newf.acid_to_ph_57 = query.value(17).toDouble();
-    newf.inventory = query.value(18).toDouble();
+    newf.di_ph = query.value("di_ph").toDouble();
+    newf.acid_to_ph_57 = query.value("acid_to_ph_57").toDouble();
+    newf.inventory = query.value("inventory").toDouble();
+    newf.adjust_to_total_100 = false;
+    newf.percentage = 0;
     newf.amount = 0;
     newf.added = FERMENTABLE_ADDED_BOTTLE;
 
@@ -522,25 +524,27 @@
         query.next();
     }
 
-    newf.name = query.value(0).toString();
-    newf.origin = query.value(1).toString();
-    newf.supplier = query.value(2).toString();
-    newf.cost = query.value(3).toDouble();
-    newf.type = query.value(4).toInt();
-    newf.yield = query.value(5).toDouble();
-    newf.color = query.value(6).toDouble();
-    newf.coarse_fine_diff = query.value(7).toDouble();
-    newf.moisture = query.value(8).toDouble();
-    newf.diastatic_power = query.value(9).toDouble();
-    newf.protein = query.value(10).toDouble();
-    newf.dissolved_protein = query.value(11).toDouble();
-    newf.max_in_batch = query.value(12).toDouble();
-    newf.graintype = query.value(13).toInt();
-    newf.recommend_mash = query.value(14).toInt() ? true:false;
+    newf.name = query.value("name").toString();
+    newf.origin = query.value("origin").toString();
+    newf.supplier = query.value("supplier").toString();
+    newf.cost = query.value("cost").toDouble();
+    newf.type = query.value("type").toInt();
+    newf.yield = query.value("yield").toDouble();
+    newf.color = query.value("color").toDouble();
+    newf.coarse_fine_diff = query.value("coarse_fine_diff").toDouble();
+    newf.moisture = query.value("moisture").toDouble();
+    newf.diastatic_power = query.value("diastatic_power").toDouble();
+    newf.protein = query.value("protein").toDouble();
+    newf.dissolved_protein = query.value("dissolved_protein").toDouble();
+    newf.max_in_batch = query.value("max_in_batch").toDouble();
+    newf.graintype = query.value("graintype").toInt();
+    newf.recommend_mash = query.value("recommend_mash").toInt() ? true:false;
     newf.add_after_boil = true;
-    newf.di_ph = query.value(16).toDouble();
-    newf.acid_to_ph_57 = query.value(17).toDouble();
-    newf.inventory = query.value(18).toDouble();
+    newf.di_ph = query.value("di_ph").toDouble();
+    newf.acid_to_ph_57 = query.value("acid_to_ph_57").toDouble();
+    newf.inventory = query.value("inventory").toDouble();
+    newf.adjust_to_total_100 = false;
+    newf.percentage = 0;
     newf.amount = 0;
     newf.added = FERMENTABLE_ADDED_KEGS;