changeset
Database upgrade will let the yeastpack cells at 0. Disabled some debug messages needed for development. Updated yeastpack editor tooltips.
Thu, 02 Feb 2023 17:14:28 +0100
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Thu, 02 Feb 2023 17:14:28 +0100
- changeset 485
- 83b5c2b3c414
- parent 484
- ebf7ef31da35
- child 486
- f1cc6a30623d
Database upgrade will let the yeastpack cells at 0. Disabled some debug messages needed for development. Updated yeastpack editor tooltips.
--- a/src/MainWindow.cpp Thu Feb 02 15:50:15 2023 +0100 +++ b/src/MainWindow.cpp Thu Feb 02 17:14:28 2023 +0100 @@ -164,7 +164,7 @@ */ void MainWindow::updateDataBase() { - QSqlQuery query1, query2, query3, query4; + QSqlQuery query1, query2, query4; int count = 0; bool added_packs = false; @@ -204,20 +204,12 @@ if (! query2.first()) { qDebug() << " add yeastpack" << query1.value("laboratory").toString() << query1.value("form").toInt(); - query3.prepare("SELECT record,cells FROM inventory_yeasts WHERE laboratory=:laboratory AND form=:form"); - query3.bindValue(":laboratory", query1.value("laboratory").toString()); - query3.bindValue(":form", query1.value("form").toInt()); - query3.exec(); - query3.first(); - /* Should succeed */ - query4.prepare("INSERT INTO inventory_yeastpack SET uuid=:uuid, laboratory=:laboratory, " - "form=:form, package=:package, cells=:cells, viability=:viability, max=:max"); + "form=:form, package=:package, viability=:viability, max=:max"); query4.bindValue(":uuid", QUuid::createUuid().toString().mid(1, 36)); query4.bindValue(":laboratory", query1.value("laboratory").toString()); query4.bindValue(":form", query1.value("form").toInt()); query4.bindValue(":package", g_yeast_forms[query1.value("form").toInt()]); - query4.bindValue(":cells", query3.value("cells").toDouble()); switch (query1.value("form").toInt()) { case YEAST_FORMS_LIQUID: query4.bindValue(":viability", 0.80); query4.bindValue(":max", 97);
--- a/src/database/db_product.cpp Thu Feb 02 15:50:15 2023 +0100 +++ b/src/database/db_product.cpp Thu Feb 02 17:14:28 2023 +0100 @@ -434,7 +434,7 @@ } else if (yeasts.isArray()) { for (int i = 0; i < yeasts.array().size(); i++) { QJsonObject obj = yeasts.array().at(i).toObject(); - qDebug() << "yeasts_Json" << i << obj; +// qDebug() << "yeasts_Json" << i << obj; Yeasts y; /* First some defaults for newer fields. */ y.tolerance = y.harvest_time = y.pitch_temperature = y.zymocide = 0; @@ -446,7 +446,7 @@ /* Clear Yeast Package data */ y.yp_uuid = QString(); y.yp_package = QString(); - y.yp_cells = obj["y_cells"].toDouble(); + y.yp_cells = 0; y.yp_viability = 0.99; y.yp_max = 100; y.yp_size = 0.01; @@ -512,7 +512,7 @@ * Yeast Pack. */ if (obj.contains("y_package") && obj["y_package"].isObject()) { - qDebug() << "y_package object present"; +// qDebug() << "y_package object present"; QJsonObject package = obj.value("y_package").toObject(); qDebug() << "yeasts_Json package" << i << package; y.yp_uuid = package["uuid"].toString(); @@ -521,8 +521,6 @@ y.yp_viability = package["viability"].toDouble(); y.yp_max = package["max"].toInt(); y.yp_size = package["size"].toDouble(); - } else { - qDebug() << "y_package not present"; } prod->yeasts.append(y); @@ -995,7 +993,7 @@ obj.insert("y_sg_hi", round(prod->yeasts.at(i).sg_hi * 1000) / 1000); obj.insert("y_cost", round(prod->yeasts.at(i).cost * 1000) / 1000); if (! product->yeasts.at(i).yp_uuid.isNull() && (product->yeasts.at(i).yp_uuid.length() == 36)) { - qDebug() << "yeasts_Json append package"; +// qDebug() << "yeasts_Json append package"; QJsonObject package; package.insert("uuid", prod->yeasts.at(i).yp_uuid); package.insert("package", prod->yeasts.at(i).yp_package);
--- a/translations/bmsapp_en.ts Thu Feb 02 15:50:15 2023 +0100 +++ b/translations/bmsapp_en.ts Thu Feb 02 17:14:28 2023 +0100 @@ -4366,7 +4366,7 @@ <message> <location filename="../src/EditProductTab3.cpp" line="1073"/> <location filename="../src/EditProductTab4.cpp" line="633"/> - <location filename="../src/EditProductTab6.cpp" line="1267"/> + <location filename="../src/EditProductTab6.cpp" line="1306"/> <source>Use at:</source> <translation type="unfinished"></translation> </message> @@ -4380,7 +4380,7 @@ <location filename="../src/EditProductTab3.cpp" line="1083"/> <location filename="../src/EditProductTab4.cpp" line="643"/> <location filename="../src/EditProductTab5.cpp" line="674"/> - <location filename="../src/EditProductTab6.cpp" line="1247"/> + <location filename="../src/EditProductTab6.cpp" line="1286"/> <source>In stock:</source> <translation type="unfinished"></translation> </message> @@ -4522,8 +4522,8 @@ <location filename="../src/EditProductTab4.cpp" line="619"/> <location filename="../src/EditProductTab5.cpp" line="525"/> <location filename="../src/EditProductTab5.cpp" line="650"/> - <location filename="../src/EditProductTab6.cpp" line="1077"/> - <location filename="../src/EditProductTab6.cpp" line="1260"/> + <location filename="../src/EditProductTab6.cpp" line="1116"/> + <location filename="../src/EditProductTab6.cpp" line="1299"/> <source>Amount in gr:</source> <translation type="unfinished"></translation> </message> @@ -4562,8 +4562,8 @@ <message> <location filename="../src/EditProductTab5.cpp" line="528"/> <location filename="../src/EditProductTab5.cpp" line="652"/> - <location filename="../src/EditProductTab6.cpp" line="1084"/> - <location filename="../src/EditProductTab6.cpp" line="1262"/> + <location filename="../src/EditProductTab6.cpp" line="1123"/> + <location filename="../src/EditProductTab6.cpp" line="1301"/> <source>Amount in ml:</source> <translation type="unfinished"></translation> </message> @@ -4574,13 +4574,13 @@ </message> <message> <location filename="../src/EditProductTab5.cpp" line="720"/> - <location filename="../src/EditProductTab6.cpp" line="1319"/> + <location filename="../src/EditProductTab6.cpp" line="1358"/> <source>Primary</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab5.cpp" line="721"/> - <location filename="../src/EditProductTab6.cpp" line="1320"/> + <location filename="../src/EditProductTab6.cpp" line="1359"/> <source>Secondary</source> <translation type="unfinished"></translation> </message> @@ -4741,39 +4741,39 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1069"/> - <location filename="../src/EditProductTab6.cpp" line="1258"/> + <location filename="../src/EditProductTab6.cpp" line="1108"/> + <location filename="../src/EditProductTab6.cpp" line="1297"/> <source>Total packs:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1227"/> + <location filename="../src/EditProductTab6.cpp" line="1266"/> <source>Yeast name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1232"/> - <location filename="../src/EditProductTab6.cpp" line="1237"/> + <location filename="../src/EditProductTab6.cpp" line="1271"/> + <location filename="../src/EditProductTab6.cpp" line="1276"/> <source>Laboratory:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1242"/> + <location filename="../src/EditProductTab6.cpp" line="1281"/> <source>Select yeast:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1252"/> + <location filename="../src/EditProductTab6.cpp" line="1291"/> <source>Select package:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1321"/> + <location filename="../src/EditProductTab6.cpp" line="1360"/> <source>Tertiary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1322"/> + <location filename="../src/EditProductTab6.cpp" line="1361"/> <source>Bottle</source> <translation type="unfinished"></translation> </message> @@ -8467,48 +8467,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="272"/> + <location filename="../ui/EditYeastPack.ui" line="233"/> + <source>If set this will override the yeast cells setting. +Use with great care!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditYeastPack.ui" line="276"/> <source>Viability:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="313"/> + <location filename="../ui/EditYeastPack.ui" line="292"/> + <source>The viability after one month.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditYeastPack.ui" line="320"/> <source>Package size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="335"/> + <location filename="../ui/EditYeastPack.ui" line="336"/> + <source>The contents size of one package.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditYeastPack.ui" line="345"/> <source> xx</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="357"/> + <location filename="../ui/EditYeastPack.ui" line="367"/> <source>Used in yeasts:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="398"/> + <location filename="../ui/EditYeastPack.ui" line="408"/> <source>Max viability:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="414"/> + <location filename="../ui/EditYeastPack.ui" line="424"/> <source>For most 100% is good, some liquid yeast start at 97%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="423"/> - <location filename="../ui/EditYeastPack.ui" line="460"/> + <location filename="../ui/EditYeastPack.ui" line="433"/> + <location filename="../ui/EditYeastPack.ui" line="471"/> <source> %</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="445"/> - <source>The yeast health after 6 months.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ui/EditYeastPack.ui" line="479"/> + <location filename="../ui/EditYeastPack.ui" line="455"/> + <source>The yeast health after six months since production. +This is a calculated from the Viability and Max values.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditYeastPack.ui" line="490"/> <source>6 months health:</source> <translation type="unfinished"></translation> </message> @@ -8523,7 +8540,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="255"/> + <location filename="../ui/EditYeastPack.ui" line="259"/> <source>Clone</source> <translation type="unfinished"></translation> </message> @@ -12314,8 +12331,8 @@ <location filename="../src/database/db_recipe.cpp" line="654"/> <location filename="../src/database/db_recipe.cpp" line="687"/> <location filename="../src/database/db_product.cpp" line="31"/> - <location filename="../src/database/db_product.cpp" line="1050"/> - <location filename="../src/database/db_product.cpp" line="1083"/> + <location filename="../src/database/db_product.cpp" line="1048"/> + <location filename="../src/database/db_product.cpp" line="1081"/> <source>Database error</source> <translation type="unfinished"></translation> </message> @@ -12328,8 +12345,8 @@ <message> <location filename="../src/database/db_recipe.cpp" line="655"/> <location filename="../src/database/db_recipe.cpp" line="688"/> - <location filename="../src/database/db_product.cpp" line="1051"/> - <location filename="../src/database/db_product.cpp" line="1084"/> + <location filename="../src/database/db_product.cpp" line="1049"/> + <location filename="../src/database/db_product.cpp" line="1082"/> <source>MySQL error: %1 %2 %3</source>
--- a/translations/bmsapp_nl.ts Thu Feb 02 15:50:15 2023 +0100 +++ b/translations/bmsapp_nl.ts Thu Feb 02 17:14:28 2023 +0100 @@ -4882,7 +4882,7 @@ <message> <location filename="../src/EditProductTab3.cpp" line="1073"/> <location filename="../src/EditProductTab4.cpp" line="633"/> - <location filename="../src/EditProductTab6.cpp" line="1267"/> + <location filename="../src/EditProductTab6.cpp" line="1306"/> <source>Use at:</source> <translation>Toevoegen bij:</translation> </message> @@ -4896,7 +4896,7 @@ <location filename="../src/EditProductTab3.cpp" line="1083"/> <location filename="../src/EditProductTab4.cpp" line="643"/> <location filename="../src/EditProductTab5.cpp" line="674"/> - <location filename="../src/EditProductTab6.cpp" line="1247"/> + <location filename="../src/EditProductTab6.cpp" line="1286"/> <source>In stock:</source> <translation>In voorraad:</translation> </message> @@ -5038,8 +5038,8 @@ <location filename="../src/EditProductTab4.cpp" line="619"/> <location filename="../src/EditProductTab5.cpp" line="525"/> <location filename="../src/EditProductTab5.cpp" line="650"/> - <location filename="../src/EditProductTab6.cpp" line="1077"/> - <location filename="../src/EditProductTab6.cpp" line="1260"/> + <location filename="../src/EditProductTab6.cpp" line="1116"/> + <location filename="../src/EditProductTab6.cpp" line="1299"/> <source>Amount in gr:</source> <translation>Gewicht in gr:</translation> </message> @@ -5097,8 +5097,8 @@ <message> <location filename="../src/EditProductTab5.cpp" line="528"/> <location filename="../src/EditProductTab5.cpp" line="652"/> - <location filename="../src/EditProductTab6.cpp" line="1084"/> - <location filename="../src/EditProductTab6.cpp" line="1262"/> + <location filename="../src/EditProductTab6.cpp" line="1123"/> + <location filename="../src/EditProductTab6.cpp" line="1301"/> <source>Amount in ml:</source> <translation>Hoeveelheid in ml:</translation> </message> @@ -5109,13 +5109,13 @@ </message> <message> <location filename="../src/EditProductTab5.cpp" line="720"/> - <location filename="../src/EditProductTab6.cpp" line="1319"/> + <location filename="../src/EditProductTab6.cpp" line="1358"/> <source>Primary</source> <translation>Hoofdgisting</translation> </message> <message> <location filename="../src/EditProductTab5.cpp" line="721"/> - <location filename="../src/EditProductTab6.cpp" line="1320"/> + <location filename="../src/EditProductTab6.cpp" line="1359"/> <source>Secondary</source> <translation>Nagisting/lagering</translation> </message> @@ -5276,39 +5276,39 @@ <translation>Verwijder gist</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1069"/> - <location filename="../src/EditProductTab6.cpp" line="1258"/> + <location filename="../src/EditProductTab6.cpp" line="1108"/> + <location filename="../src/EditProductTab6.cpp" line="1297"/> <source>Total packs:</source> <translation>Aantal pakken:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1227"/> + <location filename="../src/EditProductTab6.cpp" line="1266"/> <source>Yeast name:</source> <translation>Gist naam:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1232"/> - <location filename="../src/EditProductTab6.cpp" line="1237"/> + <location filename="../src/EditProductTab6.cpp" line="1271"/> + <location filename="../src/EditProductTab6.cpp" line="1276"/> <source>Laboratory:</source> <translation>Laboratorium:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1242"/> + <location filename="../src/EditProductTab6.cpp" line="1281"/> <source>Select yeast:</source> <translation>Kies gist:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1252"/> + <location filename="../src/EditProductTab6.cpp" line="1291"/> <source>Select package:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1321"/> + <location filename="../src/EditProductTab6.cpp" line="1360"/> <source>Tertiary</source> <translation>Lageren</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1322"/> + <location filename="../src/EditProductTab6.cpp" line="1361"/> <source>Bottle</source> <translation>Bottelen</translation> </message> @@ -9238,48 +9238,65 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="272"/> + <location filename="../ui/EditYeastPack.ui" line="233"/> + <source>If set this will override the yeast cells setting. +Use with great care!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditYeastPack.ui" line="276"/> <source>Viability:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="313"/> + <location filename="../ui/EditYeastPack.ui" line="292"/> + <source>The viability after one month.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditYeastPack.ui" line="320"/> <source>Package size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="335"/> + <location filename="../ui/EditYeastPack.ui" line="336"/> + <source>The contents size of one package.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ui/EditYeastPack.ui" line="345"/> <source> xx</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="357"/> + <location filename="../ui/EditYeastPack.ui" line="367"/> <source>Used in yeasts:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="398"/> + <location filename="../ui/EditYeastPack.ui" line="408"/> <source>Max viability:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="414"/> + <location filename="../ui/EditYeastPack.ui" line="424"/> <source>For most 100% is good, some liquid yeast start at 97%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="423"/> - <location filename="../ui/EditYeastPack.ui" line="460"/> + <location filename="../ui/EditYeastPack.ui" line="433"/> + <location filename="../ui/EditYeastPack.ui" line="471"/> <source> %</source> <translation type="unfinished"> %</translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="445"/> - <source>The yeast health after 6 months.</source> + <location filename="../ui/EditYeastPack.ui" line="455"/> + <source>The yeast health after six months since production. +This is a calculated from the Viability and Max values.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="479"/> + <location filename="../ui/EditYeastPack.ui" line="490"/> <source>6 months health:</source> <translation type="unfinished"></translation> </message> @@ -9297,7 +9314,7 @@ <translation type="obsolete">Miljard cellen/gram:</translation> </message> <message> - <location filename="../ui/EditYeastPack.ui" line="255"/> + <location filename="../ui/EditYeastPack.ui" line="259"/> <source>Clone</source> <translation type="unfinished">Kloon</translation> </message> @@ -13967,8 +13984,8 @@ <location filename="../src/database/db_recipe.cpp" line="654"/> <location filename="../src/database/db_recipe.cpp" line="687"/> <location filename="../src/database/db_product.cpp" line="31"/> - <location filename="../src/database/db_product.cpp" line="1050"/> - <location filename="../src/database/db_product.cpp" line="1083"/> + <location filename="../src/database/db_product.cpp" line="1048"/> + <location filename="../src/database/db_product.cpp" line="1081"/> <source>Database error</source> <translation>Database fout</translation> </message> @@ -13981,8 +13998,8 @@ <message> <location filename="../src/database/db_recipe.cpp" line="655"/> <location filename="../src/database/db_recipe.cpp" line="688"/> - <location filename="../src/database/db_product.cpp" line="1051"/> - <location filename="../src/database/db_product.cpp" line="1084"/> + <location filename="../src/database/db_product.cpp" line="1049"/> + <location filename="../src/database/db_product.cpp" line="1082"/> <source>MySQL error: %1 %2 %3</source>
--- a/ui/EditYeastPack.ui Thu Feb 02 15:50:15 2023 +0100 +++ b/ui/EditYeastPack.ui Thu Feb 02 17:14:28 2023 +0100 @@ -229,6 +229,10 @@ <height>24</height> </rect> </property> + <property name="toolTip"> + <string>If set this will override the yeast cells setting. +Use with great care!</string> + </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> @@ -284,6 +288,9 @@ <height>24</height> </rect> </property> + <property name="toolTip"> + <string>The viability after one month.</string> + </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> @@ -325,6 +332,9 @@ <height>24</height> </rect> </property> + <property name="toolTip"> + <string>The contents size of one package.</string> + </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> @@ -442,7 +452,8 @@ </rect> </property> <property name="toolTip"> - <string>The yeast health after 6 months.</string> + <string>The yeast health after six months since production. +This is a calculated from the Viability and Max values.</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
