Mercurial > bmsapp / file diff

--- a/src/database/db_product.cpp	Mon Oct 24 16:06:14 2022 +0200
+++ b/src/database/db_product.cpp	Mon Oct 24 19:59:08 2022 +0200
@@ -64,17 +64,22 @@
     prod->eq_trub_chiller_loss = query.value("eq_trub_chiller_loss").toDouble();
     prod->eq_evap_rate = query.value("eq_evap_rate").toDouble();
     prod->eq_boil_time = query.value("eq_boil_time").toDouble();
-    prod->eq_calc_boil_volume = query.value("eq_calc_boil_volume").toInt() ? true:false;
+//    prod->eq_calc_boil_volume = query.value("eq_calc_boil_volume").toInt() ? true:false;
     prod->eq_top_up_kettle = query.value("eq_top_up_kettle").toDouble();
-    prod->eq_hop_utilization = query.value("eq_hop_utilization").toDouble();
-    prod->eq_lauter_volume = query.value("eq_lauter_volume").toDouble();
-    prod->eq_lauter_height = query.value("eq_lauter_height").toDouble();
+//    prod->eq_hop_utilization = query.value("eq_hop_utilization").toDouble();
+//    prod->eq_lauter_volume = query.value("eq_lauter_volume").toDouble();
+//    prod->eq_lauter_height = query.value("eq_lauter_height").toDouble();
     prod->eq_lauter_deadspace = query.value("eq_lauter_deadspace").toDouble();
     prod->eq_kettle_volume = query.value("eq_kettle_volume").toDouble();
     prod->eq_kettle_height = query.value("eq_kettle_height").toDouble();
     prod->eq_mash_volume = query.value("eq_mash_volume").toDouble();
     prod->eq_mash_max = query.value("eq_mash_max").toDouble();
     prod->eq_efficiency = query.value("eq_efficiency").toDouble();
+    prod->eq_chiller_type = query.value("eq_chiller_type").toInt();
+    prod->eq_chiller_to79 = query.value("eq_chiller_to79").toDouble();
+    prod->eq_chiller_volume = query.value("eq_chiller_volume").toDouble();
+    prod->eq_chiller_lpm = query.value("eq_chiller_lpm").toDouble();
+    prod->eq_chiller_loss = query.value("eq_chiller_loss").toDouble();
 
     prod->brew_date_start = query.value("brew_date_start").toDateTime();
     prod->brew_mash_ph = query.value("brew_mash_ph").toDouble();
@@ -561,10 +566,11 @@
         "eq_batch_size=:eq_batch_size, eq_tun_volume=:eq_tun_volume, eq_tun_weight=:eq_tun_weight, "
         "eq_tun_specific_heat=:eq_tun_specific_heat, eq_tun_material=:eq_tun_material, eq_tun_height=:eq_tun_height, "
         "eq_top_up_water=:eq_top_up_water, eq_trub_chiller_loss=:eq_chiller_loss, eq_evap_rate=:eq_evap_rate, "
-        "eq_boil_time=:eq_boil_time, eq_calc_boil_volume=:eq_calcboil, eq_top_up_kettle=:eq_top_up_kettle, "
-        "eq_hop_utilization=:eq_hopfactor, eq_notes=:eq_notes, eq_lauter_volume=:eq_lauter_volume, "
-        "eq_lauter_height=:eq_lauter_height, eq_lauter_deadspace=:eq_lauter_deadspace, eq_kettle_volume=:eq_kettle_volume, "
+        "eq_boil_time=:eq_boil_time, eq_top_up_kettle=:eq_top_up_kettle, eq_notes=:eq_notes, "
+        "eq_lauter_deadspace=:eq_lauter_deadspace, eq_kettle_volume=:eq_kettle_volume, "
         "eq_kettle_height=:eq_kettle_height, eq_mash_volume=:eq_mash_volume, eq_mash_max=:eq_mash_max, "
+	"eq_chiller_type=:eq_chiller_type, eq_chiller_to79=:eq_chiller_to79, eq_chiller_volume=:eq_chiller_volume, "
+	"eq_chiller_lpm=:eq_chiller_lpm, eq_chiller_loss=:eq_chiller_loss, "
 	"brew_date_start=:brew_date_start, brew_mash_ph=:brew_mash_ph, brew_mash_sg=:brew_mash_sg, "
 	"brew_mash_efficiency=:brew_mash_efficiency, brew_sparge_temperature=:brew_sparge_temperature, "
 	"brew_sparge_volume=:brew_sparge_volume, brew_sparge_est=:brew_sparge_est, brew_sparge_ph=:brew_sparge_ph, "
@@ -655,12 +661,12 @@
     query.bindValue(":eq_chiller_loss", round(prod->eq_trub_chiller_loss * 10) / 10);
     query.bindValue(":eq_evap_rate", round(prod->eq_evap_rate * 100) / 100);
     query.bindValue(":eq_boil_time", round(prod->eq_boil_time));
-    query.bindValue(":eq_calcboil", prod->eq_calc_boil_volume ? 1:0);
+    //query.bindValue(":eq_calcboil", prod->eq_calc_boil_volume ? 1:0);
     query.bindValue(":eq_top_up_kettle", round(prod->eq_top_up_kettle * 10) / 10);
-    query.bindValue(":eq_hopfactor", round(prod->eq_hop_utilization));
+    //query.bindValue(":eq_hopfactor", round(prod->eq_hop_utilization));
     query.bindValue(":eq_notes", prod->eq_notes);
-    query.bindValue(":eq_lauter_volume", round(prod->eq_lauter_volume * 10) / 10);
-    query.bindValue(":eq_lauter_height", round(prod->eq_lauter_height * 1000) / 1000);
+    //query.bindValue(":eq_lauter_volume", round(prod->eq_lauter_volume * 10) / 10);
+    //query.bindValue(":eq_lauter_height", round(prod->eq_lauter_height * 1000) / 1000);
     query.bindValue(":eq_lauter_deadspace", round(prod->eq_lauter_deadspace * 10) / 10);
     query.bindValue(":eq_kettle_volume", round(prod->eq_kettle_volume * 10) / 10);
     query.bindValue(":eq_kettle_height", round(prod->eq_kettle_height * 1000) / 1000);