diff -r 48de0f61e5ea -r 19cbd065765e src/ProdOnDate.cpp --- a/src/ProdOnDate.cpp Sat Jun 22 11:28:14 2024 +0200 +++ b/src/ProdOnDate.cpp Sun Jun 23 11:35:42 2024 +0200 @@ -264,7 +264,7 @@ bool first = true; QSqlQuery query0; - query0.prepare("SELECT DISTINCT YEAR(brew_date_start) AS YEAR FROM products WHERE stage='11' ORDER BY YEAR(brew_date_start) DESC"); + query0.prepare("SELECT DISTINCT YEAR(package_date) AS YEAR FROM products WHERE stage='11' ORDER BY YEAR(package_date) DESC"); query0.exec(); while (query0.next()) { year = new QTreeWidgetItem( QStringList( { query0.value(0).toString() } )); @@ -272,11 +272,11 @@ year->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator); QSqlQuery query1; - query1.prepare("SELECT name,record,code,brew_date_start FROM products WHERE stage='11' AND YEAR(brew_date_start)=:theyear ORDER BY code,name"); + query1.prepare("SELECT name,record,code,package_date FROM products WHERE stage='11' AND YEAR(package_date)=:theyear ORDER BY package_date DESC,code"); query1.bindValue(":theyear", query0.value(0).toString()); query1.exec(); while (query1.next()) { - name = new QTreeWidgetItem(QStringList({ "", query1.value("brew_date_start").toDate().toString("dd MMM yyyy"), + name = new QTreeWidgetItem(QStringList({ "", query1.value("package_date").toDate().toString("dd MMM yyyy"), query1.value("code").toString(), query1.value("name").toString(), query1.value("record").toString() })); year->addChild( name ); }