Mercurial > bmsapp / file diff

--- a/src/EditProductTab5.cpp	Fri Apr 29 21:42:00 2022 +0200
+++ b/src/EditProductTab5.cpp	Fri Apr 29 22:49:32 2022 +0200
@@ -52,16 +52,17 @@
     const QSignalBlocker blocker8(ui->mw_acidPick);
     const QSignalBlocker blocker9(ui->mw_acidvolEdit);
 
-    const QStringList labels({tr("Ingredient"), tr("Type"), tr("Use at"), tr("Time"), tr("Amount"), tr("Delete"), tr("Edit") });
+    const QStringList labels({tr("Ingredient"), tr("Type"), tr("Use at"), tr("Time"), tr("Amount"), tr("Stock"), tr("Delete"), tr("Edit") });
 
-    ui->miscsTable->setColumnCount(7);
-    ui->miscsTable->setColumnWidth(0, 300);	/* Ingredient	*/
-    ui->miscsTable->setColumnWidth(1, 100);	/* Type		*/
-    ui->miscsTable->setColumnWidth(2, 100);	/* Added	*/
+    ui->miscsTable->setColumnCount(8);
+    ui->miscsTable->setColumnWidth(0, 250);	/* Ingredient	*/
+    ui->miscsTable->setColumnWidth(1,  90);	/* Type		*/
+    ui->miscsTable->setColumnWidth(2,  90);	/* Added	*/
     ui->miscsTable->setColumnWidth(3,  75);	/* Time		*/
-    ui->miscsTable->setColumnWidth(4,  90);	/* Amount	*/
-    ui->miscsTable->setColumnWidth(5,  80);	/* Delete	*/
-    ui->miscsTable->setColumnWidth(6,  80);	/* Edit		*/
+    ui->miscsTable->setColumnWidth(4,  80);	/* Amount	*/
+    ui->miscsTable->setColumnWidth(5,  80);	/* Stock	*/
+    ui->miscsTable->setColumnWidth(6,  80);	/* Delete	*/
+    ui->miscsTable->setColumnWidth(7,  80);	/* Edit		*/
     ui->miscsTable->setHorizontalHeaderLabels(labels);
     ui->miscsTable->verticalHeader()->hide();
     ui->miscsTable->setRowCount(product->miscs.size());
@@ -95,13 +96,20 @@
 	item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
         ui->miscsTable->setItem(i, 4, item);
 
+	if (product->miscs.at(i).m_amount_is_weight)
+            item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(i).m_inventory * 1000.0, 3, 'f', 2, '0'));
+        else
+            item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(i).m_inventory * 1000.0, 3, 'f', 2, '0'));
+        item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
+        ui->miscsTable->setItem(i, 5, item);
+
 	/*
 	 * Add the Delete and Edit row buttons.
 	 * Not for water agents, these are set on the water tab.
 	 */
 	if (product->miscs.at(i).m_type == 4) {
-	    ui->miscsTable->removeCellWidget(i, 5);
 	    ui->miscsTable->removeCellWidget(i, 6);
+	    ui->miscsTable->removeCellWidget(i, 7);
 	} else {
             pWidget = new QWidget();
             QPushButton* btn_dele = new QPushButton();
@@ -112,7 +120,7 @@
             pLayout->addWidget(btn_dele);
             pLayout->setContentsMargins(5, 0, 5, 0);
             pWidget->setLayout(pLayout);
-            ui->miscsTable->setCellWidget(i, 5, pWidget);
+            ui->miscsTable->setCellWidget(i, 6, pWidget);
 
             pWidget = new QWidget();
             QPushButton* btn_edit = new QPushButton();
@@ -123,7 +131,7 @@
             pLayout->addWidget(btn_edit);
             pLayout->setContentsMargins(5, 0, 5, 0);
             pWidget->setLayout(pLayout);
-            ui->miscsTable->setCellWidget(i, 6, pWidget);
+            ui->miscsTable->setCellWidget(i, 7, pWidget);
 	}
 
 	/*