diff -r fa7cad488e27 -r 7792a410a277 src/EditProduct.cpp --- a/src/EditProduct.cpp Wed May 18 17:03:05 2022 +0200 +++ b/src/EditProduct.cpp Wed May 18 22:21:16 2022 +0200 @@ -984,10 +984,11 @@ ui->tert_abvShow->setValue(Utils::abvol(product->brew_fermenter_sg, product->fg)); // Tab packaging. - ui->pack_dateEdit->setText(product->package_date.toString("dd MMM yyyy")); + ui->pack_dateEdit->setDate(product->package_date); ui->pack_carbloShow->setValue(product->st_carb_min); ui->pack_carbhiShow->setValue(product->st_carb_max); ui->pack_volumeEdit->setValue(product->package_volume); + ui->pack_volumeEdit->setMaximum(product->brew_fermenter_volume); ui->pack_addvolEdit->setValue(product->package_infuse_amount); ui->pack_addabvEdit->setValue(product->package_infuse_abv); ui->pack_notesEdit->setText(product->package_infuse_notes); @@ -1138,6 +1139,20 @@ connect(ui->ferm_log1Button, SIGNAL(clicked()), this, SLOT(ferm_log1_button())); connect(ui->ferm_log2Button, SIGNAL(clicked()), this, SLOT(ferm_log2_button())); + /* All signals from tab Package */ + calcPack(); + connect(ui->pack_dateEdit, &QDateEdit::dateChanged, this, &EditProduct::pack_date_changed); + connect(ui->pack_dateButton, SIGNAL(clicked()), this, SLOT(pack_date_button())); + connect(ui->pack_ackButton, SIGNAL(clicked()), this, SLOT(pack_date_ack())); + connect(ui->pack_volumeEdit, QOverload::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::pack_volume_changed); + connect(ui->pack_phEdit, QOverload::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::pack_ph_changed); + connect(ui->pack_addvolEdit, QOverload::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::pack_infusion_vol_changed); + connect(ui->pack_addabvEdit, QOverload::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::pack_infusion_abv_changed); + connect(ui->pack_notesEdit, &QLineEdit::textChanged, this, &EditProduct::pack_infusion_txt_changed); + connect(ui->pack_abvShow, QOverload::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::pack_abv_changed); + + /* All signals from tab Tasting */ + setStage(); ui->saveButton->setEnabled(false); @@ -1453,7 +1468,7 @@ query.bindValue(":tertiary_temp", round(product->tertiary_temp * 10) / 10); query.bindValue(":package_date", product->package_date); query.bindValue(":package_volume", round(product->package_volume * 10) / 10); - query.bindValue(":package_infuse_amount", round(product->package_infuse_amount * 10) / 10); + query.bindValue(":package_infuse_amount", round(product->package_infuse_amount * 1000) / 1000); query.bindValue(":package_infuse_abv", round(product->package_infuse_abv * 100) / 100); query.bindValue(":package_infuse_notes", product->package_infuse_notes); query.bindValue(":package_abv", round(product->package_abv * 100) / 100);