Sun, 29 Jan 2023 14:40:43 +0100
Version 0.4.0. Added database upgrade procedure on startup. Make sure inventory_yeastpack database is created and has default entries. This will become a table with data for different yeast packs.
CMakeLists.txt | file | annotate | diff | comparison | revisions | |
src/MainWindow.cpp | file | annotate | diff | comparison | revisions | |
src/MainWindow.h | file | annotate | diff | comparison | revisions | |
translations/bmsapp_en.ts | file | annotate | diff | comparison | revisions | |
translations/bmsapp_nl.ts | file | annotate | diff | comparison | revisions |
--- a/CMakeLists.txt Sat Jan 28 10:36:59 2023 +0100 +++ b/CMakeLists.txt Sun Jan 29 14:40:43 2023 +0100 @@ -8,8 +8,8 @@ # ===== Set application version ===== SET( bmsapp_VERSION_MAJOR 0 ) -SET( bmsapp_VERSION_MINOR 3 ) -SET( bmsapp_VERSION_PATCH 6 ) +SET( bmsapp_VERSION_MINOR 4 ) +SET( bmsapp_VERSION_PATCH 0 ) # Compile flags
--- a/src/MainWindow.cpp Sat Jan 28 10:36:59 2023 +0100 +++ b/src/MainWindow.cpp Sun Jan 29 14:40:43 2023 +0100 @@ -67,6 +67,7 @@ db = new DataBase(); db->openDataBase(useDevelopOption); + updateDataBase(); loadSetup(); maintDataBase(); openWS(useDevelopOption); @@ -158,6 +159,74 @@ /* + * Upgrade database. Check and do upgrades. + */ +void MainWindow::updateDataBase() +{ + QSqlQuery query1, query2, query3, query4; + int count = 0; + + qDebug() << "updateDatabase() start"; + + /* + * Make sure we have the inventory_yeastpack with initial records. + */ + query1.exec("CREATE TABLE IF NOT EXISTS `inventory_yeastpack` (" + "`record` int(11) NOT NULL AUTO_INCREMENT," + "`uuid` varchar(36) NOT NULL," + "`laboratory` varchar(128) NOT NULL," + "`form` tinyint(4) NOT NULL DEFAULT 0," + "`package` varchar(128) NOT NULL," + "`notes` text DEFAULT NULL," + "`cells` double NOT NULL DEFAULT 0," + "`viability` double NOT NULL DEFAULT 0.99," + "`max` tinyint(4) NOT NULL DEFAULT 100," + "`size` float NOT NULL DEFAULT 0," + "PRIMARY KEY (`record`)," + "UNIQUE KEY `uuid` (`uuid`)," + "KEY `lab_form` (`laboratory`,`form`) USING BTREE" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Yeast packages data'"); + if (query1.lastError().isValid()) { + qWarning() << " create inventory_yeastpack" << query1.lastError(); + } else { + query1.exec("SELECT DISTINCT laboratory,form FROM inventory_yeasts"); + while (query1.next()) { + query2.prepare("SELECT record FROM inventory_yeastpack WHERE laboratory=:laboratory AND form=:form"); + query2.bindValue(":laboratory", query1.value("laboratory").toString()); + query2.bindValue(":form", query1.value("form").toInt()); + query2.exec(); + 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"); + 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()); + query4.exec(); + if (query4.lastError().isValid()) { + qWarning() << " add yeastpack" << query4.lastError(); + } else { + count++; + } + } + } + } + + qDebug() << "updateDatabase()" << count << "updates"; +} + + +/* * On the server where bmsd runs, there is a crontask.php that does these checks * too. Here we do some of the same commands so that we have the results sooner. * Currently this takes 6 to 9 mSecs.
--- a/src/MainWindow.h Sat Jan 28 10:36:59 2023 +0100 +++ b/src/MainWindow.h Sun Jan 29 14:40:43 2023 +0100 @@ -213,6 +213,11 @@ void loadSetup(); /** + * @brief Do database updates. + */ + void updateDataBase(); + + /** * @brief Do database maintenance. */ void maintDataBase();
--- a/translations/bmsapp_en.ts Sat Jan 28 10:36:59 2023 +0100 +++ b/translations/bmsapp_en.ts Sun Jan 29 14:40:43 2023 +0100 @@ -2350,8 +2350,8 @@ <location filename="../src/EditProductTab4.cpp" line="149"/> <location filename="../src/EditProductTab5.cpp" line="75"/> <location filename="../src/EditProductTab5.cpp" line="165"/> - <location filename="../src/EditProductTab6.cpp" line="61"/> - <location filename="../src/EditProductTab6.cpp" line="164"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> + <location filename="../src/EditProductTab6.cpp" line="158"/> <location filename="../src/EditProductExport.cpp" line="874"/> <source>Delete</source> <translation type="unfinished"></translation> @@ -3424,7 +3424,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="7287"/> - <location filename="../src/EditProductTab6.cpp" line="345"/> + <location filename="../src/EditProductTab6.cpp" line="338"/> <location filename="../src/EditProductTab7.cpp" line="35"/> <source>Volume</source> <translation type="unfinished"></translation> @@ -4230,7 +4230,7 @@ <location filename="../src/EditProductTab3.cpp" line="73"/> <location filename="../src/EditProductTab4.cpp" line="55"/> <location filename="../src/EditProductTab5.cpp" line="75"/> - <location filename="../src/EditProductTab6.cpp" line="60"/> + <location filename="../src/EditProductTab6.cpp" line="54"/> <location filename="../src/EditProductTab7.cpp" line="34"/> <source>Type</source> <translation type="unfinished"></translation> @@ -4254,7 +4254,7 @@ <location filename="../src/EditProductTab3.cpp" line="74"/> <location filename="../src/EditProductTab4.cpp" line="56"/> <location filename="../src/EditProductTab5.cpp" line="75"/> - <location filename="../src/EditProductTab6.cpp" line="61"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <source>Amount</source> <translation type="unfinished"></translation> </message> @@ -4262,7 +4262,7 @@ <location filename="../src/EditProductTab3.cpp" line="74"/> <location filename="../src/EditProductTab4.cpp" line="56"/> <location filename="../src/EditProductTab5.cpp" line="75"/> - <location filename="../src/EditProductTab6.cpp" line="61"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <source>Stock</source> <translation type="unfinished"></translation> </message> @@ -4283,8 +4283,8 @@ <location filename="../src/EditProductTab4.cpp" line="160"/> <location filename="../src/EditProductTab5.cpp" line="75"/> <location filename="../src/EditProductTab5.cpp" line="176"/> - <location filename="../src/EditProductTab6.cpp" line="61"/> - <location filename="../src/EditProductTab6.cpp" line="175"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> + <location filename="../src/EditProductTab6.cpp" line="169"/> <source>Edit</source> <translation type="unfinished"></translation> </message> @@ -4330,7 +4330,7 @@ <location filename="../src/EditProductTab3.cpp" line="730"/> <location filename="../src/EditProductTab4.cpp" line="361"/> <location filename="../src/EditProductTab5.cpp" line="399"/> - <location filename="../src/EditProductTab6.cpp" line="915"/> + <location filename="../src/EditProductTab6.cpp" line="907"/> <location filename="../src/EditProductTab7.cpp" line="306"/> <location filename="../src/EditProductTab13.cpp" line="279"/> <location filename="../src/EditProduct.cpp" line="910"/> @@ -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="1228"/> + <location filename="../src/EditProductTab6.cpp" line="1220"/> <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="1213"/> + <location filename="../src/EditProductTab6.cpp" line="1205"/> <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="1048"/> - <location filename="../src/EditProductTab6.cpp" line="1221"/> + <location filename="../src/EditProductTab6.cpp" line="1040"/> + <location filename="../src/EditProductTab6.cpp" line="1213"/> <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="1055"/> - <location filename="../src/EditProductTab6.cpp" line="1223"/> + <location filename="../src/EditProductTab6.cpp" line="1047"/> + <location filename="../src/EditProductTab6.cpp" line="1215"/> <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="1277"/> + <location filename="../src/EditProductTab6.cpp" line="1269"/> <source>Primary</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditProductTab5.cpp" line="721"/> - <location filename="../src/EditProductTab6.cpp" line="1278"/> + <location filename="../src/EditProductTab6.cpp" line="1270"/> <source>Secondary</source> <translation type="unfinished"></translation> </message> @@ -4590,185 +4590,185 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="60"/> + <location filename="../src/EditProductTab6.cpp" line="54"/> <source>Yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="60"/> + <location filename="../src/EditProductTab6.cpp" line="54"/> <source>Laboratory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="60"/> + <location filename="../src/EditProductTab6.cpp" line="54"/> <source>Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="60"/> + <location filename="../src/EditProductTab6.cpp" line="54"/> <source>Use for</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="60"/> + <location filename="../src/EditProductTab6.cpp" line="54"/> <source>Min.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="60"/> + <location filename="../src/EditProductTab6.cpp" line="54"/> <source>Max.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="61"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <source>Tol.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="61"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <source>Attn.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="61"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <source>STA</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="154"/> - <location filename="../src/EditProductTab6.cpp" line="158"/> + <location filename="../src/EditProductTab6.cpp" line="148"/> + <location filename="../src/EditProductTab6.cpp" line="152"/> <source>Yeast already used</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="345"/> + <location filename="../src/EditProductTab6.cpp" line="338"/> <source>Method</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="345"/> + <location filename="../src/EditProductTab6.cpp" line="338"/> <source>Inj. factor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="345"/> + <location filename="../src/EditProductTab6.cpp" line="338"/> <source>New cells</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="345"/> + <location filename="../src/EditProductTab6.cpp" line="338"/> <source>Total cells</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="345"/> + <location filename="../src/EditProductTab6.cpp" line="338"/> <source>Grow factor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="727"/> + <location filename="../src/EditProductTab6.cpp" line="719"/> <source>BMSapp - Pitchrate</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProductTab6.cpp" line="731"/> + <source>Beer pitch type:</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProductTab6.cpp" line="739"/> - <source>Beer pitch type:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="747"/> <source>0.075 Real Kveik</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="748"/> + <location filename="../src/EditProductTab6.cpp" line="740"/> <source>0.75 Ale, upto 1.060</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="749"/> + <location filename="../src/EditProductTab6.cpp" line="741"/> <source>1.0 Ale, above 1.060</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="750"/> + <location filename="../src/EditProductTab6.cpp" line="742"/> <source>1.5 Lager, upto 1.060</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="751"/> + <location filename="../src/EditProductTab6.cpp" line="743"/> <source>2.0 Lager, above 1.060</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="782"/> + <location filename="../src/EditProductTab6.cpp" line="774"/> <source>Retry starter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="782"/> + <location filename="../src/EditProductTab6.cpp" line="774"/> <source>Retry to automatic create starter steps</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="816"/> + <location filename="../src/EditProductTab6.cpp" line="808"/> <source>Start step type:</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/EditProductTab6.cpp" line="813"/> + <source>Starter step volume:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="820"/> + <source>Stirred</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/EditProductTab6.cpp" line="821"/> - <source>Starter step volume:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="828"/> - <source>Stirred</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="829"/> <source>Shaken</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="830"/> + <location filename="../src/EditProductTab6.cpp" line="822"/> <source>Simple</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="915"/> + <location filename="../src/EditProductTab6.cpp" line="907"/> <source>Delete yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1040"/> - <location filename="../src/EditProductTab6.cpp" line="1219"/> + <location filename="../src/EditProductTab6.cpp" line="1032"/> + <location filename="../src/EditProductTab6.cpp" line="1211"/> <source>Total packs:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1193"/> + <location filename="../src/EditProductTab6.cpp" line="1185"/> <source>Yeast name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1198"/> - <location filename="../src/EditProductTab6.cpp" line="1203"/> + <location filename="../src/EditProductTab6.cpp" line="1190"/> + <location filename="../src/EditProductTab6.cpp" line="1195"/> <source>Laboratory:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1208"/> + <location filename="../src/EditProductTab6.cpp" line="1200"/> <source>Select yeast:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1279"/> + <location filename="../src/EditProductTab6.cpp" line="1271"/> <source>Tertiary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1280"/> + <location filename="../src/EditProductTab6.cpp" line="1272"/> <source>Bottle</source> <translation type="unfinished"></translation> </message> @@ -6092,7 +6092,7 @@ <location filename="../src/EditRecipeTab4.cpp" line="61"/> <location filename="../src/EditRecipeTab4.cpp" line="127"/> <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <location filename="../src/EditRecipeTab5.cpp" line="102"/> + <location filename="../src/EditRecipeTab5.cpp" line="117"/> <location filename="../src/EditRecipeTab6.cpp" line="33"/> <location filename="../src/EditRecipeTab6.cpp" line="131"/> <source>Delete</source> @@ -6963,7 +6963,7 @@ <location filename="../src/EditRecipeTab4.cpp" line="61"/> <location filename="../src/EditRecipeTab4.cpp" line="138"/> <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <location filename="../src/EditRecipeTab5.cpp" line="113"/> + <location filename="../src/EditRecipeTab5.cpp" line="128"/> <location filename="../src/EditRecipeTab6.cpp" line="33"/> <location filename="../src/EditRecipeTab6.cpp" line="142"/> <source>Edit</source> @@ -6978,7 +6978,7 @@ <location filename="../src/EditRecipeTab2.cpp" line="526"/> <location filename="../src/EditRecipeTab3.cpp" line="296"/> <location filename="../src/EditRecipeTab4.cpp" line="343"/> - <location filename="../src/EditRecipeTab5.cpp" line="261"/> + <location filename="../src/EditRecipeTab5.cpp" line="280"/> <location filename="../src/EditRecipeTab6.cpp" line="283"/> <location filename="../src/EditRecipe.cpp" line="515"/> <source>Delete %1</source> @@ -7013,7 +7013,7 @@ <message> <location filename="../src/EditRecipeTab2.cpp" line="861"/> <location filename="../src/EditRecipeTab3.cpp" line="592"/> - <location filename="../src/EditRecipeTab5.cpp" line="497"/> + <location filename="../src/EditRecipeTab5.cpp" line="538"/> <source>Use at:</source> <translation type="unfinished"></translation> </message> @@ -7027,7 +7027,7 @@ <location filename="../src/EditRecipeTab2.cpp" line="871"/> <location filename="../src/EditRecipeTab3.cpp" line="607"/> <location filename="../src/EditRecipeTab4.cpp" line="608"/> - <location filename="../src/EditRecipeTab5.cpp" line="482"/> + <location filename="../src/EditRecipeTab5.cpp" line="523"/> <source>In stock:</source> <translation type="unfinished"></translation> </message> @@ -7055,7 +7055,7 @@ </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="930"/> - <location filename="../src/EditRecipeTab5.cpp" line="548"/> + <location filename="../src/EditRecipeTab5.cpp" line="589"/> <source>Bottle</source> <translation type="unfinished"></translation> </message> @@ -7168,8 +7168,8 @@ <location filename="../src/EditRecipeTab3.cpp" line="571"/> <location filename="../src/EditRecipeTab4.cpp" line="468"/> <location filename="../src/EditRecipeTab4.cpp" line="584"/> - <location filename="../src/EditRecipeTab5.cpp" line="365"/> - <location filename="../src/EditRecipeTab5.cpp" line="490"/> + <location filename="../src/EditRecipeTab5.cpp" line="388"/> + <location filename="../src/EditRecipeTab5.cpp" line="531"/> <source>Amount in gr:</source> <translation type="unfinished"></translation> </message> @@ -7258,8 +7258,8 @@ <message> <location filename="../src/EditRecipeTab4.cpp" line="471"/> <location filename="../src/EditRecipeTab4.cpp" line="586"/> - <location filename="../src/EditRecipeTab5.cpp" line="369"/> - <location filename="../src/EditRecipeTab5.cpp" line="492"/> + <location filename="../src/EditRecipeTab5.cpp" line="392"/> + <location filename="../src/EditRecipeTab5.cpp" line="533"/> <source>Amount in ml:</source> <translation type="unfinished"></translation> </message> @@ -7270,13 +7270,13 @@ </message> <message> <location filename="../src/EditRecipeTab4.cpp" line="654"/> - <location filename="../src/EditRecipeTab5.cpp" line="545"/> + <location filename="../src/EditRecipeTab5.cpp" line="586"/> <source>Primary</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/EditRecipeTab4.cpp" line="655"/> - <location filename="../src/EditRecipeTab5.cpp" line="546"/> + <location filename="../src/EditRecipeTab5.cpp" line="587"/> <source>Secondary</source> <translation type="unfinished"></translation> </message> @@ -7321,34 +7321,39 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="261"/> + <location filename="../src/EditRecipeTab5.cpp" line="41"/> + <source>STA</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditRecipeTab5.cpp" line="280"/> <source>Delete yeast</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="361"/> - <location filename="../src/EditRecipeTab5.cpp" line="488"/> + <location filename="../src/EditRecipeTab5.cpp" line="384"/> + <location filename="../src/EditRecipeTab5.cpp" line="529"/> <source>Total packs:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="462"/> + <location filename="../src/EditRecipeTab5.cpp" line="503"/> <source>Yeast name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="467"/> - <location filename="../src/EditRecipeTab5.cpp" line="472"/> + <location filename="../src/EditRecipeTab5.cpp" line="508"/> + <location filename="../src/EditRecipeTab5.cpp" line="513"/> <source>Laboratory:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="477"/> + <location filename="../src/EditRecipeTab5.cpp" line="518"/> <source>Select yeast:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="547"/> + <location filename="../src/EditRecipeTab5.cpp" line="588"/> <source>Tertiary</source> <translation type="unfinished"></translation> </message>
--- a/translations/bmsapp_nl.ts Sat Jan 28 10:36:59 2023 +0100 +++ b/translations/bmsapp_nl.ts Sun Jan 29 14:40:43 2023 +0100 @@ -2650,8 +2650,8 @@ <location filename="../src/EditProductTab4.cpp" line="149"/> <location filename="../src/EditProductTab5.cpp" line="75"/> <location filename="../src/EditProductTab5.cpp" line="165"/> - <location filename="../src/EditProductTab6.cpp" line="61"/> - <location filename="../src/EditProductTab6.cpp" line="164"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> + <location filename="../src/EditProductTab6.cpp" line="158"/> <location filename="../src/EditProductExport.cpp" line="874"/> <source>Delete</source> <translation>Verwijder</translation> @@ -3314,7 +3314,7 @@ </message> <message> <location filename="../ui/EditProduct.ui" line="7287"/> - <location filename="../src/EditProductTab6.cpp" line="345"/> + <location filename="../src/EditProductTab6.cpp" line="338"/> <location filename="../src/EditProductTab7.cpp" line="35"/> <source>Volume</source> <translation>Volume</translation> @@ -4734,7 +4734,7 @@ <location filename="../src/EditProductTab3.cpp" line="73"/> <location filename="../src/EditProductTab4.cpp" line="55"/> <location filename="../src/EditProductTab5.cpp" line="75"/> - <location filename="../src/EditProductTab6.cpp" line="60"/> + <location filename="../src/EditProductTab6.cpp" line="54"/> <location filename="../src/EditProductTab7.cpp" line="34"/> <source>Type</source> <translation>Soort</translation> @@ -4758,7 +4758,7 @@ <location filename="../src/EditProductTab3.cpp" line="74"/> <location filename="../src/EditProductTab4.cpp" line="56"/> <location filename="../src/EditProductTab5.cpp" line="75"/> - <location filename="../src/EditProductTab6.cpp" line="61"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <source>Amount</source> <translation>Hoeveel</translation> </message> @@ -4766,7 +4766,7 @@ <location filename="../src/EditProductTab3.cpp" line="74"/> <location filename="../src/EditProductTab4.cpp" line="56"/> <location filename="../src/EditProductTab5.cpp" line="75"/> - <location filename="../src/EditProductTab6.cpp" line="61"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <source>Stock</source> <translation>Voorraad</translation> </message> @@ -4787,8 +4787,8 @@ <location filename="../src/EditProductTab4.cpp" line="160"/> <location filename="../src/EditProductTab5.cpp" line="75"/> <location filename="../src/EditProductTab5.cpp" line="176"/> - <location filename="../src/EditProductTab6.cpp" line="61"/> - <location filename="../src/EditProductTab6.cpp" line="175"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> + <location filename="../src/EditProductTab6.cpp" line="169"/> <source>Edit</source> <translation>Wijzig</translation> </message> @@ -4846,7 +4846,7 @@ <location filename="../src/EditProductTab3.cpp" line="730"/> <location filename="../src/EditProductTab4.cpp" line="361"/> <location filename="../src/EditProductTab5.cpp" line="399"/> - <location filename="../src/EditProductTab6.cpp" line="915"/> + <location filename="../src/EditProductTab6.cpp" line="907"/> <location filename="../src/EditProductTab7.cpp" line="306"/> <location filename="../src/EditProductTab13.cpp" line="279"/> <location filename="../src/EditProduct.cpp" line="910"/> @@ -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="1228"/> + <location filename="../src/EditProductTab6.cpp" line="1220"/> <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="1213"/> + <location filename="../src/EditProductTab6.cpp" line="1205"/> <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="1048"/> - <location filename="../src/EditProductTab6.cpp" line="1221"/> + <location filename="../src/EditProductTab6.cpp" line="1040"/> + <location filename="../src/EditProductTab6.cpp" line="1213"/> <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="1055"/> - <location filename="../src/EditProductTab6.cpp" line="1223"/> + <location filename="../src/EditProductTab6.cpp" line="1047"/> + <location filename="../src/EditProductTab6.cpp" line="1215"/> <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="1277"/> + <location filename="../src/EditProductTab6.cpp" line="1269"/> <source>Primary</source> <translation>Hoofdgisting</translation> </message> <message> <location filename="../src/EditProductTab5.cpp" line="721"/> - <location filename="../src/EditProductTab6.cpp" line="1278"/> + <location filename="../src/EditProductTab6.cpp" line="1270"/> <source>Secondary</source> <translation>Nagisting/lagering</translation> </message> @@ -5125,185 +5125,185 @@ <translation>Bottelen</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="60"/> + <location filename="../src/EditProductTab6.cpp" line="54"/> <source>Yeast</source> <translation>Gist</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="60"/> + <location filename="../src/EditProductTab6.cpp" line="54"/> <source>Laboratory</source> <translation>Laboratorium</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="60"/> + <location filename="../src/EditProductTab6.cpp" line="54"/> <source>Code</source> <translation>Product code</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="60"/> + <location filename="../src/EditProductTab6.cpp" line="54"/> <source>Use for</source> <translation>Toepassing</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="60"/> + <location filename="../src/EditProductTab6.cpp" line="54"/> <source>Min.</source> <translation></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="60"/> + <location filename="../src/EditProductTab6.cpp" line="54"/> <source>Max.</source> <translation></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="61"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <source>Tol.</source> <translation></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="61"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <source>Attn.</source> <translation></translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="61"/> + <location filename="../src/EditProductTab6.cpp" line="55"/> <source>STA</source> <translation>STA</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="154"/> - <location filename="../src/EditProductTab6.cpp" line="158"/> + <location filename="../src/EditProductTab6.cpp" line="148"/> + <location filename="../src/EditProductTab6.cpp" line="152"/> <source>Yeast already used</source> <translation>Gist is al verwerkt</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="345"/> + <location filename="../src/EditProductTab6.cpp" line="338"/> <source>Method</source> <translation>Methode</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="345"/> + <location filename="../src/EditProductTab6.cpp" line="338"/> <source>Inj. factor</source> <translation>Injectie</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="345"/> + <location filename="../src/EditProductTab6.cpp" line="338"/> <source>New cells</source> <translation>Celgroei</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="345"/> + <location filename="../src/EditProductTab6.cpp" line="338"/> <source>Total cells</source> <translation>Totaal</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="345"/> + <location filename="../src/EditProductTab6.cpp" line="338"/> <source>Grow factor</source> <translation>Groeifactor</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="727"/> + <location filename="../src/EditProductTab6.cpp" line="719"/> <source>BMSapp - Pitchrate</source> <translation>BMSapp - Gist enten</translation> </message> <message> + <location filename="../src/EditProductTab6.cpp" line="731"/> + <source>Beer pitch type:</source> + <translation>Biergist nodig:</translation> + </message> + <message> <location filename="../src/EditProductTab6.cpp" line="739"/> - <source>Beer pitch type:</source> - <translation>Biergist nodig:</translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="747"/> <source>0.075 Real Kveik</source> <translation>0,075 Echte Kveik</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="748"/> + <location filename="../src/EditProductTab6.cpp" line="740"/> <source>0.75 Ale, upto 1.060</source> <translation>0,75 Bovengist tot 1.060</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="749"/> + <location filename="../src/EditProductTab6.cpp" line="741"/> <source>1.0 Ale, above 1.060</source> <translation>1,0 Bovengist hoger 1.060</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="750"/> + <location filename="../src/EditProductTab6.cpp" line="742"/> <source>1.5 Lager, upto 1.060</source> <translation>1,5 Ondergist tot 1.060</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="751"/> + <location filename="../src/EditProductTab6.cpp" line="743"/> <source>2.0 Lager, above 1.060</source> <translation>2,0 Ondergist hoger 1.060</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="782"/> + <location filename="../src/EditProductTab6.cpp" line="774"/> <source>Retry starter</source> <translation>Ververs starter</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="782"/> + <location filename="../src/EditProductTab6.cpp" line="774"/> <source>Retry to automatic create starter steps</source> <translation>Ververs de starter stappen automatisch</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="816"/> + <location filename="../src/EditProductTab6.cpp" line="808"/> <source>Start step type:</source> <translation>Starter stap type:</translation> </message> <message> + <location filename="../src/EditProductTab6.cpp" line="813"/> + <source>Starter step volume:</source> + <translation>Starter stap volume:</translation> + </message> + <message> + <location filename="../src/EditProductTab6.cpp" line="820"/> + <source>Stirred</source> + <translation>Geroerd</translation> + </message> + <message> <location filename="../src/EditProductTab6.cpp" line="821"/> - <source>Starter step volume:</source> - <translation>Starter stap volume:</translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="828"/> - <source>Stirred</source> - <translation>Geroerd</translation> - </message> - <message> - <location filename="../src/EditProductTab6.cpp" line="829"/> <source>Shaken</source> <translation>Geschud</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="830"/> + <location filename="../src/EditProductTab6.cpp" line="822"/> <source>Simple</source> <translation>Simpel</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="915"/> + <location filename="../src/EditProductTab6.cpp" line="907"/> <source>Delete yeast</source> <translation>Verwijder gist</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1040"/> - <location filename="../src/EditProductTab6.cpp" line="1219"/> + <location filename="../src/EditProductTab6.cpp" line="1032"/> + <location filename="../src/EditProductTab6.cpp" line="1211"/> <source>Total packs:</source> <translation>Aantal pakken:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1193"/> + <location filename="../src/EditProductTab6.cpp" line="1185"/> <source>Yeast name:</source> <translation>Gist naam:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1198"/> - <location filename="../src/EditProductTab6.cpp" line="1203"/> + <location filename="../src/EditProductTab6.cpp" line="1190"/> + <location filename="../src/EditProductTab6.cpp" line="1195"/> <source>Laboratory:</source> <translation>Laboratorium:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1208"/> + <location filename="../src/EditProductTab6.cpp" line="1200"/> <source>Select yeast:</source> <translation>Kies gist:</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1279"/> + <location filename="../src/EditProductTab6.cpp" line="1271"/> <source>Tertiary</source> <translation>Lageren</translation> </message> <message> - <location filename="../src/EditProductTab6.cpp" line="1280"/> + <location filename="../src/EditProductTab6.cpp" line="1272"/> <source>Bottle</source> <translation>Bottelen</translation> </message> @@ -6724,7 +6724,7 @@ <location filename="../src/EditRecipeTab4.cpp" line="61"/> <location filename="../src/EditRecipeTab4.cpp" line="127"/> <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <location filename="../src/EditRecipeTab5.cpp" line="102"/> + <location filename="../src/EditRecipeTab5.cpp" line="117"/> <location filename="../src/EditRecipeTab6.cpp" line="33"/> <location filename="../src/EditRecipeTab6.cpp" line="131"/> <source>Delete</source> @@ -7676,7 +7676,7 @@ <location filename="../src/EditRecipeTab4.cpp" line="61"/> <location filename="../src/EditRecipeTab4.cpp" line="138"/> <location filename="../src/EditRecipeTab5.cpp" line="41"/> - <location filename="../src/EditRecipeTab5.cpp" line="113"/> + <location filename="../src/EditRecipeTab5.cpp" line="128"/> <location filename="../src/EditRecipeTab6.cpp" line="33"/> <location filename="../src/EditRecipeTab6.cpp" line="142"/> <source>Edit</source> @@ -7691,7 +7691,7 @@ <location filename="../src/EditRecipeTab2.cpp" line="526"/> <location filename="../src/EditRecipeTab3.cpp" line="296"/> <location filename="../src/EditRecipeTab4.cpp" line="343"/> - <location filename="../src/EditRecipeTab5.cpp" line="261"/> + <location filename="../src/EditRecipeTab5.cpp" line="280"/> <location filename="../src/EditRecipeTab6.cpp" line="283"/> <location filename="../src/EditRecipe.cpp" line="515"/> <source>Delete %1</source> @@ -7726,7 +7726,7 @@ <message> <location filename="../src/EditRecipeTab2.cpp" line="861"/> <location filename="../src/EditRecipeTab3.cpp" line="592"/> - <location filename="../src/EditRecipeTab5.cpp" line="497"/> + <location filename="../src/EditRecipeTab5.cpp" line="538"/> <source>Use at:</source> <translation>Toevoegen bij:</translation> </message> @@ -7740,7 +7740,7 @@ <location filename="../src/EditRecipeTab2.cpp" line="871"/> <location filename="../src/EditRecipeTab3.cpp" line="607"/> <location filename="../src/EditRecipeTab4.cpp" line="608"/> - <location filename="../src/EditRecipeTab5.cpp" line="482"/> + <location filename="../src/EditRecipeTab5.cpp" line="523"/> <source>In stock:</source> <translation>In voorraad:</translation> </message> @@ -7768,7 +7768,7 @@ </message> <message> <location filename="../src/EditRecipeTab2.cpp" line="930"/> - <location filename="../src/EditRecipeTab5.cpp" line="548"/> + <location filename="../src/EditRecipeTab5.cpp" line="589"/> <source>Bottle</source> <translation>Bottelen</translation> </message> @@ -7881,8 +7881,8 @@ <location filename="../src/EditRecipeTab3.cpp" line="571"/> <location filename="../src/EditRecipeTab4.cpp" line="468"/> <location filename="../src/EditRecipeTab4.cpp" line="584"/> - <location filename="../src/EditRecipeTab5.cpp" line="365"/> - <location filename="../src/EditRecipeTab5.cpp" line="490"/> + <location filename="../src/EditRecipeTab5.cpp" line="388"/> + <location filename="../src/EditRecipeTab5.cpp" line="531"/> <source>Amount in gr:</source> <translation>Gewicht in gr:</translation> </message> @@ -7969,8 +7969,8 @@ <message> <location filename="../src/EditRecipeTab4.cpp" line="471"/> <location filename="../src/EditRecipeTab4.cpp" line="586"/> - <location filename="../src/EditRecipeTab5.cpp" line="369"/> - <location filename="../src/EditRecipeTab5.cpp" line="492"/> + <location filename="../src/EditRecipeTab5.cpp" line="392"/> + <location filename="../src/EditRecipeTab5.cpp" line="533"/> <source>Amount in ml:</source> <translation>Hoeveelheid in ml:</translation> </message> @@ -7981,13 +7981,13 @@ </message> <message> <location filename="../src/EditRecipeTab4.cpp" line="654"/> - <location filename="../src/EditRecipeTab5.cpp" line="545"/> + <location filename="../src/EditRecipeTab5.cpp" line="586"/> <source>Primary</source> <translation>Hoofdgisting</translation> </message> <message> <location filename="../src/EditRecipeTab4.cpp" line="655"/> - <location filename="../src/EditRecipeTab5.cpp" line="546"/> + <location filename="../src/EditRecipeTab5.cpp" line="587"/> <source>Secondary</source> <translation>Nagisting/lagering</translation> </message> @@ -8038,34 +8038,39 @@ <translation>SVG %</translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="261"/> + <location filename="../src/EditRecipeTab5.cpp" line="41"/> + <source>STA</source> + <translation type="unfinished">STA</translation> + </message> + <message> + <location filename="../src/EditRecipeTab5.cpp" line="280"/> <source>Delete yeast</source> <translation>Verwijder gist</translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="361"/> - <location filename="../src/EditRecipeTab5.cpp" line="488"/> + <location filename="../src/EditRecipeTab5.cpp" line="384"/> + <location filename="../src/EditRecipeTab5.cpp" line="529"/> <source>Total packs:</source> <translation>Aantal pakken:</translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="462"/> + <location filename="../src/EditRecipeTab5.cpp" line="503"/> <source>Yeast name:</source> <translation>Gist naam:</translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="467"/> - <location filename="../src/EditRecipeTab5.cpp" line="472"/> + <location filename="../src/EditRecipeTab5.cpp" line="508"/> + <location filename="../src/EditRecipeTab5.cpp" line="513"/> <source>Laboratory:</source> <translation>Laboratorium:</translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="477"/> + <location filename="../src/EditRecipeTab5.cpp" line="518"/> <source>Select yeast:</source> <translation>Kies gist:</translation> </message> <message> - <location filename="../src/EditRecipeTab5.cpp" line="547"/> + <location filename="../src/EditRecipeTab5.cpp" line="588"/> <source>Tertiary</source> <translation>Lageren</translation> </message>