--- a/src/database/db_product.cpp Mon Jun 13 15:47:16 2022 +0200
+++ b/src/database/db_product.cpp Mon Jun 13 16:47:52 2022 +0200
@@ -277,42 +277,42 @@
for (int i = 0; i < fermentables.array().size(); i++) {
QJsonObject obj = fermentables.array().at(i).toObject();
Fermentables f;
- f.f_inventory = 0;
- f.f_avail = false;
- f.f_name = obj["f_name"].toString();
- f.f_origin = obj["f_origin"].toString();
- f.f_supplier = obj["f_supplier"].toString();
- f.f_amount = obj["f_amount"].toDouble();
- f.f_cost = obj["f_cost"].toDouble();
- f.f_type = obj["f_type"].toInt();
- f.f_yield = obj["f_yield"].toDouble();
- f.f_color = obj["f_color"].toDouble();
- f.f_coarse_fine_diff = obj["f_coarse_fine_diff"].toDouble();
- f.f_moisture = obj["f_moisture"].toDouble();
- f.f_diastatic_power = obj["f_diastatic_power"].toDouble();
- f.f_protein = obj["f_protein"].toDouble();
- f.f_dissolved_protein = obj["f_dissolved_protein"].toDouble();
- f.f_max_in_batch = obj["f_max_in_batch"].toDouble();
- f.f_graintype = obj["f_graintype"].toInt();
- f.f_added = obj["f_added"].toInt();
- f.f_recommend_mash = obj["f_recommend_mash"].toInt() ? true:false;
- f.f_add_after_boil = obj["f_add_after_boil"].toInt() ? true:false;
- f.f_adjust_to_total_100 = obj["f_adjust_to_total_100"].toInt() ? true:false;
- f.f_percentage = obj["f_percentage"].toDouble();
- f.f_di_ph = obj["f_di_ph"].toDouble();
- f.f_acid_to_ph_57 = obj["f_acid_to_ph_57"].toDouble();
- if (f.f_adjust_to_total_100)
+ f.inventory = 0;
+ f.avail = false;
+ f.name = obj["f_name"].toString();
+ f.origin = obj["f_origin"].toString();
+ f.supplier = obj["f_supplier"].toString();
+ f.amount = obj["f_amount"].toDouble();
+ f.cost = obj["f_cost"].toDouble();
+ f.type = obj["f_type"].toInt();
+ f.yield = obj["f_yield"].toDouble();
+ f.color = obj["f_color"].toDouble();
+ f.coarse_fine_diff = obj["f_coarse_fine_diff"].toDouble();
+ f.moisture = obj["f_moisture"].toDouble();
+ f.diastatic_power = obj["f_diastatic_power"].toDouble();
+ f.protein = obj["f_protein"].toDouble();
+ f.dissolved_protein = obj["f_dissolved_protein"].toDouble();
+ f.max_in_batch = obj["f_max_in_batch"].toDouble();
+ f.graintype = obj["f_graintype"].toInt();
+ f.added = obj["f_added"].toInt();
+ f.recommend_mash = obj["f_recommend_mash"].toInt() ? true:false;
+ f.add_after_boil = obj["f_add_after_boil"].toInt() ? true:false;
+ f.adjust_to_total_100 = obj["f_adjust_to_total_100"].toInt() ? true:false;
+ f.percentage = obj["f_percentage"].toDouble();
+ f.di_ph = obj["f_di_ph"].toDouble();
+ f.acid_to_ph_57 = obj["f_acid_to_ph_57"].toDouble();
+ if (f.adjust_to_total_100)
prod->fermentables_use100 = true;
- percentcheck += f.f_percentage;
+ percentcheck += f.percentage;
/* Check and update inventory */
yquery.prepare("SELECT inventory FROM inventory_fermentables WHERE name=:name AND supplier=:supplier AND origin=:origin");
- yquery.bindValue(":name", f.f_name);
- yquery.bindValue(":supplier", f.f_supplier);
- yquery.bindValue(":origin", f.f_origin);
+ yquery.bindValue(":name", f.name);
+ yquery.bindValue(":supplier", f.supplier);
+ yquery.bindValue(":origin", f.origin);
yquery.exec();
if (yquery.first()) {
- f.f_avail = true;
- f.f_inventory = yquery.value(0).toDouble();
+ f.avail = true;
+ f.inventory = yquery.value(0).toDouble();
}
prod->fermentables.append(f);
}
@@ -321,12 +321,12 @@
/* Missing percentages, fix it. */
double total = 0;
for (int i = 0; i < prod->fermentables.size(); i++) {
- if (prod->fermentables.at(i).f_added < 4)
- total += prod->fermentables.at(i).f_amount;
+ if (prod->fermentables.at(i).added < 4)
+ total += prod->fermentables.at(i).amount;
}
for (int i = 0; i < prod->fermentables.size(); i++) {
- if (prod->fermentables.at(i).f_added < 4)
- prod->fermentables[i].f_percentage = round((prod->fermentables.at(i).f_amount / total) * 10000.0) / 100.0;
+ if (prod->fermentables.at(i).added < 4)
+ prod->fermentables[i].percentage = round((prod->fermentables.at(i).amount / total) * 10000.0) / 100.0;
}
qInfo() << " fixed missing percentages";
// is_changed();
@@ -839,28 +839,28 @@
QJsonArray array;
for (int i = 0; i < prod->fermentables.size(); i++) {
QJsonObject obj;
- obj.insert("f_name", prod->fermentables.at(i).f_name);
- obj.insert("f_origin", prod->fermentables.at(i).f_origin);
- obj.insert("f_supplier", prod->fermentables.at(i).f_supplier);
- obj.insert("f_amount", round(prod->fermentables.at(i).f_amount * 100000) / 100000);
- obj.insert("f_cost", round(prod->fermentables.at(i).f_cost * 1000) / 1000);
- obj.insert("f_type", prod->fermentables.at(i).f_type);
- obj.insert("f_yield", round(prod->fermentables.at(i).f_yield * 10) / 10);
- obj.insert("f_color", round(prod->fermentables.at(i).f_color * 10) / 10);
- obj.insert("f_coarse_fine_diff", round(prod->fermentables.at(i).f_coarse_fine_diff * 10) / 10);
- obj.insert("f_moisture", round(prod->fermentables.at(i).f_moisture * 10) / 10);
- obj.insert("f_diastatic_power", round(prod->fermentables.at(i).f_diastatic_power * 100000) / 100000);
- obj.insert("f_protein", round(prod->fermentables.at(i).f_protein * 10) / 10);
- obj.insert("f_dissolved_protein", round(prod->fermentables.at(i).f_dissolved_protein * 10) / 10);
- obj.insert("f_max_in_batch", prod->fermentables.at(i).f_max_in_batch);
- obj.insert("f_graintype", prod->fermentables.at(i).f_graintype);
- obj.insert("f_added", prod->fermentables.at(i).f_added);
- obj.insert("f_recommend_mash", prod->fermentables.at(i).f_recommend_mash ? 1:0);
- obj.insert("f_add_after_boil", prod->fermentables.at(i).f_add_after_boil ? 1:0);
- obj.insert("f_adjust_to_total_100", prod->fermentables.at(i).f_adjust_to_total_100 ? 1:0);
- obj.insert("f_percentage", round(prod->fermentables.at(i).f_percentage * 10) / 10);
- obj.insert("f_di_ph", round(prod->fermentables.at(i).f_di_ph * 100000) / 100000);
- obj.insert("f_acid_to_ph_57", round(prod->fermentables.at(i).f_acid_to_ph_57 * 100000) / 100000);
+ obj.insert("f_name", prod->fermentables.at(i).name);
+ obj.insert("f_origin", prod->fermentables.at(i).origin);
+ obj.insert("f_supplier", prod->fermentables.at(i).supplier);
+ obj.insert("f_amount", round(prod->fermentables.at(i).amount * 100000) / 100000);
+ obj.insert("f_cost", round(prod->fermentables.at(i).cost * 1000) / 1000);
+ obj.insert("f_type", prod->fermentables.at(i).type);
+ obj.insert("f_yield", round(prod->fermentables.at(i).yield * 10) / 10);
+ obj.insert("f_color", round(prod->fermentables.at(i).color * 10) / 10);
+ obj.insert("f_coarse_fine_diff", round(prod->fermentables.at(i).coarse_fine_diff * 10) / 10);
+ obj.insert("f_moisture", round(prod->fermentables.at(i).moisture * 10) / 10);
+ obj.insert("f_diastatic_power", round(prod->fermentables.at(i).diastatic_power * 100000) / 100000);
+ obj.insert("f_protein", round(prod->fermentables.at(i).protein * 10) / 10);
+ obj.insert("f_dissolved_protein", round(prod->fermentables.at(i).dissolved_protein * 10) / 10);
+ obj.insert("f_max_in_batch", prod->fermentables.at(i).max_in_batch);
+ obj.insert("f_graintype", prod->fermentables.at(i).graintype);
+ obj.insert("f_added", prod->fermentables.at(i).added);
+ obj.insert("f_recommend_mash", prod->fermentables.at(i).recommend_mash ? 1:0);
+ obj.insert("f_add_after_boil", prod->fermentables.at(i).add_after_boil ? 1:0);
+ obj.insert("f_adjust_to_total_100", prod->fermentables.at(i).adjust_to_total_100 ? 1:0);
+ obj.insert("f_percentage", round(prod->fermentables.at(i).percentage * 10) / 10);
+ obj.insert("f_di_ph", round(prod->fermentables.at(i).di_ph * 100000) / 100000);
+ obj.insert("f_acid_to_ph_57", round(prod->fermentables.at(i).acid_to_ph_57 * 100000) / 100000);
// qDebug() << "fermentables_Json" << i << obj;
array.append(obj); /* Append this object */
}