# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1719136282 -7200
# Node ID e5972bf6e50cd680132192112e0696ed9239d704
# Parent  19cbd065765eb28a99153bbf8c188e528bb01eeb
Archive products on code and on date all use the packaging date.

diff -r 19cbd065765e -r e5972bf6e50c src/ProdOnCode.cpp
--- a/src/ProdOnCode.cpp	Sun Jun 23 11:35:42 2024 +0200
+++ b/src/ProdOnCode.cpp	Sun Jun 23 11:51:22 2024 +0200
@@ -71,7 +71,7 @@
     QHBoxLayout* pLayout;
 
     qDebug() << "ProdOnCode reload";
-    QSqlQuery query("SELECT record,name,st_name,og,fg,brew_date_start,code FROM products WHERE stage = '11' ORDER BY code,brew_date_start");
+    QSqlQuery query("SELECT record,name,st_name,og,fg,package_date,code FROM products WHERE stage = '11' ORDER BY code,package_date");
     const QStringList labels({tr("Code"), tr("Name"), tr("Style"), tr("OG"), tr("FG"),  tr("Date"), tr("Edit")});
 
     this->tableOnCode->setColumnCount(7);
@@ -100,7 +100,7 @@
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         this->tableOnCode->setItem(ridx, 4, item);
 
-	this->tableOnCode->setItem(ridx, 5, new QTableWidgetItem(query.value("brew_date_start").toDate().toString("dd MMM yyyy")));
+	this->tableOnCode->setItem(ridx, 5, new QTableWidgetItem(query.value("package_date").toDate().toString("dd MMM yyyy")));
 
 	/* Add the Edit button */
         QWidget* pWidget = new QWidget();
diff -r 19cbd065765e -r e5972bf6e50c src/ProdOnName.cpp
--- a/src/ProdOnName.cpp	Sun Jun 23 11:35:42 2024 +0200
+++ b/src/ProdOnName.cpp	Sun Jun 23 11:51:22 2024 +0200
@@ -71,7 +71,7 @@
     QHBoxLayout* pLayout;
 
     qDebug() << "ProdOnName reload";
-    QSqlQuery query("SELECT record,name,st_name,og,fg,brew_date_start,code FROM products WHERE stage = '11' ORDER BY name,brew_date_start");
+    QSqlQuery query("SELECT record,name,st_name,og,fg,package_date,code FROM products WHERE stage = '11' ORDER BY name,package_date");
     const QStringList labels({tr("Name"), tr("Style"), tr("OG"), tr("FG"),  tr("Date"), tr("Code"), tr("Edit")});
 
     this->tableOnName->setColumnCount(7);
@@ -99,7 +99,7 @@
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         this->tableOnName->setItem(ridx, 3, item);
 
-	this->tableOnName->setItem(ridx, 4, new QTableWidgetItem(query.value("brew_date_start").toDate().toString("dd MMM yyyy")));
+	this->tableOnName->setItem(ridx, 4, new QTableWidgetItem(query.value("package_date").toDate().toString("dd MMM yyyy")));
 	this->tableOnName->setItem(ridx, 5, new QTableWidgetItem(query.value("code").toString()));
 
 	/* Add the Edit button */