# HG changeset patch # User Michiel Broek # Date 1653127697 -7200 # Node ID 7966bf14cc3469566ee60d7343fa988b99871d58 # Parent 23fe317dcf3cf74e660cecdcb1d3f5cbb7caae75 Implemented insert a new product. Fixed missing product code edit slot. diff -r 23fe317dcf3c -r 7966bf14cc34 src/EditProduct.cpp --- a/src/EditProduct.cpp Fri May 20 22:06:06 2022 +0200 +++ b/src/EditProduct.cpp Sat May 21 12:08:17 2022 +0200 @@ -653,6 +653,7 @@ product->birth = QDate::currentDate(); product->stage = product->inventory_reduced = PROD_STAGE_PLAN; product->notes = ""; + product->color_method = product->ibu_method = 0; product->efficiency = 75; product->eq_batch_size = product->batch_size = 20; product->eq_boil_time = product->boil_time = 60; @@ -678,9 +679,10 @@ product->package_volume = product->package_infuse_amount = product->package_infuse_abv = product->package_abv = product->package_ph = 0; product->package_infuse_notes = ""; product->bottle_amount = product->bottle_carbonation = product->bottle_priming_amount = product->bottle_carbonation_temp = 0; - product->keg_amount = product->keg_carbonation = product->keg_priming_amount = product->keg_priming_water = 0; - product->keg_carbonation_temp = product->keg_pressure = 0; - product->bottle_priming_water = product->keg_priming_sugar = 0; + product->keg_amount = product->keg_carbonation = product->keg_priming_amount = product->keg_carbonation_temp = 0; + product->keg_pressure = 0; + product->bottle_priming_water = product->keg_priming_water = 0; + product->bottle_priming_sugar = product->keg_priming_sugar = 0; product->taste_rate = 0; product->taste_date = QDate(); product->taste_notes = product->taste_color = product->taste_transparency = product->taste_head = ""; @@ -1024,6 +1026,7 @@ // All signals from tab "Generic" connect(ui->lockedEdit, &QCheckBox::stateChanged, this, &EditProduct::is_changed); + connect(ui->codeEdit, &QLineEdit::textChanged, this, &EditProduct::code_changed); connect(ui->nameEdit, &QLineEdit::textChanged, this, &EditProduct::name_changed); connect(ui->notesEdit, SIGNAL(textChanged()), this, SLOT(notes_changed())); connect(ui->typeEdit, QOverload::of(&QComboBox::currentIndexChanged), this, &EditProduct::brew_type_changed); diff -r 23fe317dcf3c -r 7966bf14cc34 src/EditProduct.h --- a/src/EditProduct.h Fri May 20 22:06:06 2022 +0200 +++ b/src/EditProduct.h Sat May 21 12:08:17 2022 +0200 @@ -46,6 +46,7 @@ void on_exportButton_clicked(); void on_printButton_clicked(); void is_changed(); + void code_changed(QString); void name_changed(QString); void notes_changed(); void style_changed(int val); diff -r 23fe317dcf3c -r 7966bf14cc34 src/EditProductTab1.cpp --- a/src/EditProductTab1.cpp Fri May 20 22:06:06 2022 +0200 +++ b/src/EditProductTab1.cpp Sat May 21 12:08:17 2022 +0200 @@ -18,6 +18,12 @@ */ +void EditProduct::code_changed(QString code) +{ + product->code = code; + is_changed(); +} + void EditProduct::name_changed(QString name) { diff -r 23fe317dcf3c -r 7966bf14cc34 src/ProdInprod.cpp --- a/src/ProdInprod.cpp Fri May 20 22:06:06 2022 +0200 +++ b/src/ProdInprod.cpp Sat May 21 12:08:17 2022 +0200 @@ -68,7 +68,7 @@ gridLayout->addWidget(groupBox, 1, 0, 1, 1); connect(quitButton, SIGNAL(clicked()), parent, SLOT(fromProdInprod())); - //connect(insertButton, SIGNAL(clicked()), this, SLOT(on_insertButton_clicked())); + connect(insertButton, SIGNAL(clicked()), this, SLOT(on_insertButton_clicked())); connect(this, SIGNAL(setStatus(QString)), parent, SLOT(statusMsg(QString))); emit refreshTable(); } @@ -156,3 +156,8 @@ } +void ProdInprod::on_insertButton_clicked() +{ + edit(-1); +} + diff -r 23fe317dcf3c -r 7966bf14cc34 src/ProdInprod.h --- a/src/ProdInprod.h Fri May 20 22:06:06 2022 +0200 +++ b/src/ProdInprod.h Sat May 21 12:08:17 2022 +0200 @@ -26,6 +26,7 @@ private slots: void on_editButton_clicked(); + void on_insertButton_clicked(); void refreshTable(void); private: diff -r 23fe317dcf3c -r 7966bf14cc34 ui/MainWindow.ui --- a/ui/MainWindow.ui Fri May 20 22:06:06 2022 +0200 +++ b/ui/MainWindow.ui Sat May 21 12:08:17 2022 +0200 @@ -96,7 +96,20 @@ Products + + + Archive + + + + :/icons/silk/folder_database.png:/icons/silk/folder_database.png + + + + + + @@ -361,6 +374,42 @@ In Production + + + + :/icons/silk/folder_database.png:/icons/silk/folder_database.png + + + Archive + + + + + + :/icons/bms/beerstyles.png:/icons/bms/beerstyles.png + + + On Name + + + + + + :/icons/bms/beerstyles.png:/icons/bms/beerstyles.png + + + On Code + + + + + + :/icons/bms/beerstyles.png:/icons/bms/beerstyles.png + + + On Date + +