Mercurial > bmsapp / file diff

--- a/src/InventoryYeasts.cpp	Sat Apr 23 13:18:47 2022 +0200
+++ b/src/InventoryYeasts.cpp	Sat Apr 23 14:06:41 2022 +0200
@@ -18,6 +18,7 @@
 #include "EditYeast.h"
 #include "MainWindow.h"
 #include "config.h"
+#include "global.h"
 
 
 InventoryYeasts::InventoryYeasts(QWidget *parent) : QDialog(parent)
@@ -102,8 +103,6 @@
 
     QSqlQuery query("SELECT * FROM inventory_yeasts ORDER BY laboratory,product_id,name");
     const QStringList labels({tr("Laboratory"), tr("Product id"), tr("Name"), tr("Type"), tr("Form"), tr("SVG %"), tr("Tol %"), tr("POF+"), tr("STA1"), tr("Stock"), tr("Edit")});
-    const QStringList types({tr("Lager"), tr("Ale"), tr("Wheat"), tr("Wine"), tr("Champagne"), tr("Brett"), tr("Kveik"), tr("Hybrid")});
-    const QStringList form({tr("Liquid"), tr("Dry"), tr("Slant"), tr("Culture"), tr("Frozen"), tr("Bottle"), tr("Dried")});
 
     /* origin supplier name type graintype color yield inventory Edit */
     this->tableYeasts->setColumnCount(11);
@@ -130,8 +129,8 @@
 	this->tableYeasts->setItem(ridx, 0, new QTableWidgetItem(query.value(4).toString()));	/* Laboratory */
 	this->tableYeasts->setItem(ridx, 1, new QTableWidgetItem(query.value(5).toString()));	/* Product id */
 	this->tableYeasts->setItem(ridx, 2, new QTableWidgetItem(query.value(1).toString()));	/* Name	*/
-	this->tableYeasts->setItem(ridx, 3, new QTableWidgetItem(types[query.value(2).toInt()]));	/* Type */
-	this->tableYeasts->setItem(ridx, 4, new QTableWidgetItem(form[query.value(3).toInt()]));	/* Form */
+	this->tableYeasts->setItem(ridx, 3, new QTableWidgetItem(yeast_types[query.value(2).toInt()]));	/* Type */
+	this->tableYeasts->setItem(ridx, 4, new QTableWidgetItem(yeast_forms[query.value(3).toInt()]));	/* Form */
 	w = QString("%1 %").arg(query.value(9).toDouble(), 2, 'f', 1, '0' );	/* Attenuation% */
 	QTableWidgetItem *item = new QTableWidgetItem(w);
         item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);