Mercurial > bmsapp / file diff

--- a/src/EditProductTab6.cpp	Sun Jan 15 14:33:53 2023 +0100
+++ b/src/EditProductTab6.cpp	Mon Jan 16 16:55:41 2023 +0100
@@ -52,22 +52,23 @@
     std::sort(product->yeasts.begin(), product->yeasts.end(), yeast_sort_test);
 
     const QStringList labels({tr("Yeast"), tr("Laboratory"), tr("Code"), tr("Type"), tr("Use for"), tr("Min."), tr("Max."),
-		              tr("Tol."), tr("Attn."), tr("Amount"), tr("Stock"), tr("Delete"), tr("Edit") });
+		              tr("Tol."), tr("Attn."), tr("STA"), tr("Amount"), tr("Stock"), tr("Delete"), tr("Edit") });
 
-    ui->yeastsTable->setColumnCount(13);
+    ui->yeastsTable->setColumnCount(14);
     ui->yeastsTable->setColumnWidth(0, 200);	/* Yeast	*/
     ui->yeastsTable->setColumnWidth(1, 115);	/* Laboratory	*/
     ui->yeastsTable->setColumnWidth(2,  80);	/* Code		*/
-    ui->yeastsTable->setColumnWidth(3,  80);	/* Type		*/
-    ui->yeastsTable->setColumnWidth(4,  80);	/* Usage	*/
+    ui->yeastsTable->setColumnWidth(3,  75);	/* Type		*/
+    ui->yeastsTable->setColumnWidth(4,  75);	/* Usage	*/
     ui->yeastsTable->setColumnWidth(5,  50);	/* Min. 	*/
     ui->yeastsTable->setColumnWidth(6,  50);	/* Max.		*/
     ui->yeastsTable->setColumnWidth(7,  50);	/* Tolerance	*/
     ui->yeastsTable->setColumnWidth(8,  50);	/* Attenuation	*/
-    ui->yeastsTable->setColumnWidth(9,  80);	/* Amount	*/
-    ui->yeastsTable->setColumnWidth(10, 80);	/* Stock	*/
-    ui->yeastsTable->setColumnWidth(11, 80);	/* Delete	*/
-    ui->yeastsTable->setColumnWidth(12, 80);	/* Edit		*/
+    ui->yeastsTable->setColumnWidth(9,  40);	/* STA1 gen	*/
+    ui->yeastsTable->setColumnWidth(10, 80);	/* Amount	*/
+    ui->yeastsTable->setColumnWidth(11, 80);	/* Stock	*/
+    ui->yeastsTable->setColumnWidth(12, 80);	/* Delete	*/
+    ui->yeastsTable->setColumnWidth(13, 80);	/* Edit		*/
     ui->yeastsTable->setHorizontalHeaderLabels(labels);
     ui->yeastsTable->verticalHeader()->hide();
     ui->yeastsTable->setRowCount(product->yeasts.size());
@@ -102,6 +103,21 @@
         item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
         ui->yeastsTable->setItem(i, 8, item);
 
+	if (product->yeasts.at(i).use != YEAST_USE_BOTTLE && product->yeasts.at(i).sta1) {
+	    QWidget *pWidget = new QWidget();
+            QLabel *label = new QLabel;
+            label->setPixmap(QPixmap(":icons/silk/tick.png"));
+            QHBoxLayout *pLayout = new QHBoxLayout(pWidget);
+            pLayout->addWidget(label);
+            pLayout->setAlignment(Qt::AlignCenter);
+            pLayout->setContentsMargins(0, 0, 0, 0);
+            pWidget->setLayout(pLayout);
+            ui->yeastsTable->setCellWidget(i, 9, pWidget);
+	} else {
+	    ui->yeastsTable->removeCellWidget(i, 9);
+	}
+
+
 	if (product->yeasts.at(i).form == YEAST_FORMS_LIQUID)
             item = new QTableWidgetItem(QString("%1 pack").arg(product->yeasts.at(i).amount, 1, 'f', 0, '0'));
 	else if (product->yeasts.at(i).form == YEAST_FORMS_DRY || product->yeasts.at(i).form == YEAST_FORMS_DRIED)
@@ -109,7 +125,7 @@
 	else
 	    item = new QTableWidgetItem(QString("%1 ml").arg(product->yeasts.at(i).amount * 1000.0, 3, 'f', 2, '0'));
         item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
-        ui->yeastsTable->setItem(i, 9, item);
+        ui->yeastsTable->setItem(i, 10, item);
 
 	if (block_yeast(product->stage, product->yeasts.at(i).use)) {
 	    item = new QTableWidgetItem(QString(""));
@@ -124,17 +140,17 @@
 	    if (product->yeasts.at(i).inventory < product->yeasts.at(i).amount)
 	    	item->setForeground(QBrush(QColor(Qt::red)));
 	}
-        ui->yeastsTable->setItem(i, 10, item);
+        ui->yeastsTable->setItem(i, 11, item);
 
 	if (block_yeast(product->stage, product->yeasts.at(i).use)) {
-	    ui->yeastsTable->removeCellWidget(i, 11);     /* to remove the unneeded button */
-            item = new QTableWidgetItem("");
-            item->setToolTip(tr("Yeast already used"));
-            ui->yeastsTable->setItem(i, 11, item);
-            ui->yeastsTable->removeCellWidget(i, 12);
+	    ui->yeastsTable->removeCellWidget(i, 12);     /* to remove the unneeded button */
             item = new QTableWidgetItem("");
             item->setToolTip(tr("Yeast already used"));
             ui->yeastsTable->setItem(i, 12, item);
+            ui->yeastsTable->removeCellWidget(i, 13);
+            item = new QTableWidgetItem("");
+            item->setToolTip(tr("Yeast already used"));
+            ui->yeastsTable->setItem(i, 13, item);
 	} else {
 	    pWidget = new QWidget();
             QPushButton* btn_dele = new QPushButton();
@@ -145,7 +161,7 @@
             pLayout->addWidget(btn_dele);
             pLayout->setContentsMargins(5, 0, 5, 0);
             pWidget->setLayout(pLayout);
-            ui->yeastsTable->setCellWidget(i, 11, pWidget);
+            ui->yeastsTable->setCellWidget(i, 12, pWidget);
 
             pWidget = new QWidget();
             QPushButton* btn_edit = new QPushButton();
@@ -156,7 +172,7 @@
             pLayout->addWidget(btn_edit);
             pLayout->setContentsMargins(5, 0, 5, 0);
             pWidget->setLayout(pLayout);
-            ui->yeastsTable->setCellWidget(i, 12, pWidget);
+            ui->yeastsTable->setCellWidget(i, 13, pWidget);
 	}
     }
 }