diff -r 37bac72eff61 -r d369948a3eb5 src/EditProductTab11.cpp --- a/src/EditProductTab11.cpp Fri May 20 12:47:35 2022 +0200 +++ b/src/EditProductTab11.cpp Fri May 20 14:48:03 2022 +0200 @@ -150,9 +150,9 @@ qDebug() << " update priming sugar" << total; product->fermentables[i].f_amount = total; refreshFermentables(); - ui->bottle_sug_weightShow->setValue(total * 1000); is_changed(); } + ui->bottle_sug_weightShow->setValue(total * 1000); double pabv = product->final_abv + (product->bottle_priming_amount * (1 / SFactor) * 0.47) / 7.907; double pvol = product->bottle_amount - (pabv * product->bottle_amount) / 100; @@ -227,9 +227,9 @@ qDebug() << " update priming sugar" << total; product->fermentables[i].f_amount = total; refreshFermentables(); - ui->keg_sug_weightShow->setValue(total * 1000); is_changed(); } + ui->keg_sug_weightShow->setValue(total * 1000); double pabv = product->final_abv + (product->keg_priming_amount * (1 / SFactor) * 0.47) / 7.907; double pvol = product->keg_amount - (pabv * product->keg_amount) / 100; @@ -269,16 +269,29 @@ void EditProduct::pack_date_changed(QDate val) { qDebug() << "pack_date_changed" << val; + product->package_date = ui->pack_dateEdit->nullDate(); + is_changed(); + setStage(); } void EditProduct::pack_date_button() { + ui->pack_dateEdit->setDate(QDate::currentDate()); } void EditProduct::pack_date_ack() { + int rc = QMessageBox::warning(this, tr("Confirm package"), tr("Confirm that the beer is packaged and all data is correct"), + QMessageBox::Yes | QMessageBox::No, QMessageBox::No); + + if (rc == QMessageBox::No) + return; + + product->stage = PROD_STAGE_CARBONATION; + setStage(); + is_changed(); }